Menu
Hello this is my git workflow. I'm trying to create by using Sourcetree a new hotfix. Unfortunately I get this error:
There is an existing hotfix branch (issue-#001). Finish that one first.
I have already finished the issue-#001. Why I'm unable to create a new one?
307
Maintenance or “hotfix” branches are used to quickly patch production releases. Hotfix branches are a lot like release branches and feature branches except they're based on main instead of develop . This is the only branch that should fork directly off of main .
Git flow is a popular Git branching strategy aimed at simplifying release management, and was introduced by software developer Vincent Driessen in 2010. Fundamentally, Git flow involves isolating your work into different types of Git branches.
git flow is not about remote repository. With git you don't even need a remote repository, you can do it all in your local repository alone. But git flow is valid for all repositories of a project.
There is a configuration option that you can set if you want multiple hotfixes.
git config --add gitflow.multi-hotfix true
This would allow multiple hotfixes, but by default it's not allowed. You can add this option per repository or globally.
118
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
