Re: How to propagate critical fixs from master to develope branch.
- Date: Thu, 22 Nov 2018 09:28:53 +0100
- From: Mateusz Loskot <mateusz@xxxxxxxxxx>
- Subject: Re: How to propagate critical fixs from master to develope branch.
On Thu, 22 Nov 2018 at 07:39, Mgr Georg Black <georg.black@xxxxxxxxx> 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" 
> 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 
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 .
I would cherry-pick.
Mateusz Loskot, http://mateusz.loskot.net