Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Missing bugfix branches #24

Closed
mkurkov opened this issue Mar 25, 2010 · 7 comments
Closed

Missing bugfix branches #24

mkurkov opened this issue Mar 25, 2010 · 7 comments

Comments

@mkurkov
Copy link

mkurkov commented Mar 25, 2010

I wonnder why bugfix branches are missing in git flow. I think they are the same as features but with different prefix. Are they supposed to live in develop branch as commits without special branches?

@nvie
Copy link
Owner

nvie commented Mar 25, 2010

Well, that's rather arbitrary. I don't think you should hang on to the term "feature" too tight. A rule of thumb would be that if you need more than one commit for a change, you should do it on a feature branch, otherwise commit it directly on develop.

Adding another flavour of branches would only make sense if it would be an actual other flavour. What you are referring to are simply feature branches (in that they branch off from develop and merge back into develop).

I would advise to name them "fix-" manually, for example:
feature/fix-memory-crash

@mkurkov
Copy link
Author

mkurkov commented Mar 25, 2010

Thanks for clarifications.

@fatuhoku
Copy link

👍

@subtubes-io
Copy link

I came here with the same question. I understand the reasoning but the naming convention doesn't lend itself too well. I think adding "fix" might be something to consider? Just my 2 cents.

@fatuhoku
Copy link

@thiswildorchid I guess it is just convention. Bug fixes and features follow exactly the same process in git-flow. So for all intents and purposes feature/fix-... will work just fine...

@AMorgaut
Copy link

AMorgaut commented Oct 13, 2020

@thiswildorchid I guess it is just convention. Bug fixes and features follow exactly the same process in git-flow. So for all intents and purposes feature/fix-... will work just fine...

I tend to disagree
According to your reference (https://jeffkreeftmeijer.com/git-flow/), release branches are meant to only accept bugfixes, not features. Git tooling could control this rule if a bugfix related naming convention is defined (and is respected)
and one without "feature" in the name would be less confusing in that context

@alejandroclaro
Copy link

alejandroclaro commented Feb 16, 2022

My two cents.

The name is confusing, but the purpose make sense. There is no value or difference in having another prefix. The rules for such branches will be the same as feature branches.

Feature, or topic, branches are about planned changes. The nature of the change is not important.

This issue was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

6 participants