From: Jakub Narebski <jnareb@gmail.com>
To: Mike Jarmy <mjarmy@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Commiting changes onto more than one branch
Date: Wed, 25 Nov 2009 08:50:55 -0800 (PST) [thread overview]
Message-ID: <m38wdublbq.fsf@localhost.localdomain> (raw)
In-Reply-To: <6b4a562b0911250831q332ac3b5m6ee38f59e7a6f391@mail.gmail.com>
Mike Jarmy <mjarmy@gmail.com> writes:
> My question is this: How do I manage a checkin for a bugfix that
> affects, say, only branches v3, v4, and v5?
Take a look at "Resolving conflicts/dependencies between topic
branches early" blog post by Junio C Hamano (git maintainer) at
http://gitster.livejournal.com/27297.html
In short the solution is to create separate topic branch for a bugfix,
branching off earliest place where it would be relevant, then merge
this bugfix branch into all development branches you need
(e.g. maint-v3, maint-v4, maint-v5, master).
This means:
$ git checkout -b fix-frobulator--issue-1235 maint-v3
<create commit or series of commits>
$ git checkout maint-v3
$ git merge fix-frobulator--issue-1235
<resolve conflicts if any>
$ git checkout maint-v4
$ git merge fix-frobulator--issue-1235
<resolve conflicts if any>
[...]
--
Jakub Narebski
Poland
ShadeHawk on #git
next prev parent reply other threads:[~2009-11-25 16:51 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-25 16:31 Commiting changes onto more than one branch Mike Jarmy
2009-11-25 16:38 ` Eugene Sajine
2009-11-25 16:47 ` Mike Jarmy
2009-11-25 17:38 ` Avery Pennarun
2009-11-25 18:58 ` Junio C Hamano
2009-11-25 19:43 ` Mike Jarmy
2009-11-25 23:41 ` Daniel Barkalow
2009-11-25 23:56 ` Andreas Schwab
2009-11-25 16:47 ` Thomas Rast
2009-11-25 16:50 ` Jakub Narebski [this message]
2009-11-25 17:40 ` Mike Jarmy
2009-11-25 17:43 ` Nicolas Pitre
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=m38wdublbq.fsf@localhost.localdomain \
--to=jnareb@gmail.com \
--cc=git@vger.kernel.org \
--cc=mjarmy@gmail.com \
/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).