git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: How to propagate critical fixs from master to develope branch.

From
Andrew Ardill <andrew.ardill@gmail.com>
Date
Nov 23, 2018, 02:00 UTC
Message-ID
<CAH5451mb894U4GGWRkax2XPr7GGQYmMezHvJM5BCyqR=BETL=w@mail.gmail.com>
In-Reply-To
<FTG.5ClN.5saZnXxVpgT.1Rzay9@seznam.cz>
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
Previous: Mateusz Loskot
Message 3 of 3 in “How to propagate critical fixs from master to develope branch.”
  1. Mgr Georg BlackNov 22, 2018
  2. Mateusz LoskotNov 22, 2018
  3. Andrew ArdillNov 23, 2018

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.