From: Andrew Ardill <andrew.ardill@gmail.com>
To: georg.black@seznam.cz
Cc: git <git@vger.kernel.org>
Subject: Re: How to propagate critical fixs from master to develope branch.
Date: Fri, 23 Nov 2018 13:00:13 +1100 [thread overview]
Message-ID: <CAH5451mb894U4GGWRkax2XPr7GGQYmMezHvJM5BCyqR=BETL=w@mail.gmail.com> (raw)
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:
>
> 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
prev parent reply other threads:[~2018-11-23 2:00 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-22 6:39 How to propagate critical fixs from master to develope branch Mgr Georg Black
2018-11-22 8:28 ` Mateusz Loskot
2018-11-23 2:00 ` Andrew Ardill [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAH5451mb894U4GGWRkax2XPr7GGQYmMezHvJM5BCyqR=BETL=w@mail.gmail.com' \
--to=andrew.ardill@gmail.com \
--cc=georg.black@seznam.cz \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).