Hotfixing with an open release branch while this release is currently tested

Question

We are using gitflow and currently have an open release branch.

The release at A is currently on the test-system to get tested by key-users. In the meantime we need to release an urgent hotfix. Commonly we pull out a branch of master (so the latest live-system release) and merge it into development and master. If we would do this here, we would not have the hotfix in the currently open release.

So what do I have to do at the point marked as "?" in the illustration? Assume that the hotfix is ready to get merged.

Johannes Kilian_pi36cl · Answer

Additional remark: Even if you are using gitflow, you are still free to merge your changes to anywhere you want.

For example: if you don't want to have the hotfix on your develop branch, just merge it manually to your master branch and to your branch release. After this you can delete your branch hotfix. Doing so, you left the straight git-flow path ... but who cares?

If you don't want to merge all changes from your hotfix branch to your relase branch you should do a git cherry-pick, to select the commits you want to be available on your release branch.

In the most cases a prerequisite of cherry-pick are good structured commits, where each commit only contains single, comprehensive changes.

Johannes Kilian_pi36cl · Answer

Ooops - cut'n paste error. I've corrected the link.

Another additional link, as your name sounds german: https://www.ralfebert.de/git/cherry-pick/

Kai_s2q1f7 · Answer

Many thanks Johannes! Unfortunately, the provided link is broken.