Hello everyone.I red git manual but I can't figure out how to propagate critical change from master branch to long live develop branch. I red chapter about rebasing that I think could solve it but at the end of this chapter is written that it's not recommended for pubic repositories. I don't know how to do it without merging develop branch to master. I'll appreciate list of orders very much. :-) Thanks for any info or link. GB
threads / discuss / 49880
How to propagate critical fixs from master to develope branch.
Subject: How to propagate critical fixs from master to develope branch.
Mateusz LoskotRe: How to propagate critical fixs from master to develope branch.
On Thu, 22 Nov 2018 at 07:39, Mgr Georg Black <georg.black@seznam.cz> wrote:
> Hello everyone.I red git manual but I can't figure out how to propagate critical change from master branch to long live develop branch.
Have you considered "using git cherry-pick can be used to backport changes one by one" [1]
> I red chapter about rebasing that I think could solve it but at the end of this chapter is written that it's not recommended for pubic repositories. I don't know how to do it without merging develop branch to master.
rebase vs merge vs cherry-pick is a topic of constant debates and opinionated practices indeed [2]
The cherry-pick has its cons, like duplicate commits (BTW, it is a good idea to learn more about pros and cons of cherry-pick before you apply this technique). That is why workflows like GitFlow require to prepare a hotfix in a topic branch which is merged back to long-lived branch. In your case, I assume, you've done your work in long-lived master, so I think easiest is to pick that change from master and port it to the develop branch [3].
I would cherry-pick.
[1] https://www.atlassian.com/blog/git/the-essence-of-branch-based-workflows [2] https://www.atlassian.com/git/articles/git-team-workflows-merge-or-rebase [3] https://reallifeprogramming.com/git-process-that-works-say-no-to-gitflow-50bf2038ccf7
Best regards,
-- Mateusz Loskot, http://mateusz.loskot.net
Andrew ArdillRe: How to propagate critical fixs from master to develope branch.
Hi GB,
On Fri, 23 Nov 2018 at 04:23, Mgr Georg Black <georg.black@seznam.cz> wrote:
Show 5 quoted lines
> > Hello everyone.I red git manual but I can't figure out how to propagate critical change from master branch to long live develop branch. I red chapter about rebasing that I think could solve it but at the end of this chapter is written that it's not recommended for pubic repositories. I don't know how to do it without merging develop branch to master. > I'll appreciate list of orders very much. :-) > Thanks for any info or link. > GB
A lot of what to do comes down to how you and your team work, and your ongoing maintenance needs are.
The two methods I've seen used are to either cherry-pick the critical change on top of whichever branches need it, or to build the change from the oldest branch point that has the error, and then merging those changes up to any maintained branches.
The cherry-pick method is quick and dirty, and doesn't require much messing about.
The 'hotfix branch' method requires a bit more work to set up, but can make it easier to see where the change is coming from and where it has been applied. This fits in with the 'git flow' development methodology (but doesn't require it).
A pretty good discussion of these ideas can be found at https://stackoverflow.com/questions/7175869/managing-hotfixes-when-develop-branch-is-very-different-from-master
Regards,
Andrew Ardill