4 ms·
How else do you get bugfixes onto a release branch when the main develop branch has already moved on? Should you rebase your feature branch on the release bran
by jdlyga 8y ago
How else do you get bugfixes onto a release branch when the main develop branch has already moved on? Should you rebase your feature branch on the release branch instead, then merge it?
- bluejekyll 8y agoExactly. This article seems to not really discuss that case. It’s specific to feature branches off a master line. Git rebase is generally what I use in feature branches. Cherry-picking is important in the case that you mention, master to release, the opposite direction could be a merge, ie release branch to master.
- joevandyk 8y agoBranch off the release branch for fixes to it. Then merge back into release and develop branch.
- jdlyga 8y agoBut what happens if it's a fix that was made to master. Then later, the boss decides that they need that change as a bugfix to the current release? How do you accomplish that without cherry-picking? Do you rebase the feature branch it was a part of and merge it?
- servilio 8y agoThey explain that in part 3, direct link: https://blogs.msdn.microsoft.com/oldnewthing/20180314-00/?p=98235 The technique is not new, in the Monotone wiki it is known as daggy fixes: http://wiki.monotone.ca/DaggyFixes/