![]() As you suggest, the hotfix naturally flows back into develop when the release branch is merged.ĮDIT: The standard git-flow doesn't have an option to merge into the release branch so I think the only option is to do it manually (or abandon the release branch, as suggested above). Wiki Clone wiki jgit-flow / goals / hotfix-start View History Maven JGit-Flow Plugin Goals Overview Common Parameters Hotfix Start Full name: :maven-jgitflow-plugin:1.0-m4:hotfix-start Short name: jgitflow:hotfix-start Description : Prepares the project for a hotfix. Obviously merge conflicts are possible when merging the hotfix branch into the release branch and would need to be dealt with. Unless there are ways of telling git-flow about the release branch, I think I would just issue direct git commands to merge the hotfix in this case: $ git checkout master I just made a quick test with git-flow outside of SourceTree and I find the same as Thijs: standard git-flow commands ignore the release branch. It follows a branching model (or protocol) set up by Vincent Driessen. If everything is ok the hotfix branch should be merged on the release branch and after we need to delete the mybug branch. Git-flow is a GIT extension that helps you effectively manage branching in GIT. This usually is created starting from the release branch. (If work in develop immediately requires this bugfix and cannot wait for the release branch to be finished, you may safely merge the bugfix into develop now already as well.) This one will be used only if in the previous branch (release) had some issues in the testing and we need to perform a bug fix. Back-merging the bugfix into the release branch will eventually result in the bugfix being merged into develop too, when the release branch is finished. " The one exception to the rule here is that, when a release branch currently exists, the hotfix changes need to be merged into that release branch, instead of develop. The article that spawned git-flow is more explicit: " As soon as the fix is complete, it should be merged into both master and develop (or the current release branch), and master should be tagged with an updated version number." Manju Atlassian Team You need getopt to make this work. In the meanwhile, you can try resetting to system git from Preferences - Git tab to see if it helps. ![]() The standard git-flow workflow suggests merging the hotfix into an active release branch: 1 answer 1 accepted 0 votes Answer accepted Manju Atlassian Team We have ticket for this and are currently investigating. ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |