From: Enrico Weigelt <weigelt@metux.de>
To: git@vger.kernel.org
Subject: Re: Maint-only commits
Date: Sun, 18 Sep 2011 21:11:20 +0200 [thread overview]
Message-ID: <20110918191120.GA6334@nibiru.local> (raw)
In-Reply-To: <6416457.30612.1305580526325.JavaMail.root@mail.hq.genarts.com>
* Stephen Bash <bash@genarts.com> wrote:
> Hi all-
>
> In my office we've recently run into three separate fixes
> required on our maintenance branch that should not be
> included in master (our normal workflow is to make changes
> on maint, tag, release, and then merge to master). Normally
> these "maint only" fixes are interspersed with commits that
> should go back into master. In the past the "maint only"
> commits were rare, so I'd carefully use "merge -s ours"
> to avoid including the "maint only" changes in master.
> But now I'm wondering if there's a better process/workflow?
Of course, there is: use topic branches and rebase.
Assuming you've found a bug in maint, which is also still
in master.
#1: for off a topic branch (for that bug) from maint
#2: fix the bug there
#3: rebase to latest maint (if changed meanwhile) and test carefully
#4: (ff-)merge your bugfix branch to maint
#5: rebase bugfix branch to master (maybe incremental, if they
went too far away from another) and test carefully
#6: (ff-)merge bugfix branch to master
#7: drop that topic branch, as you're done now.
cu
--
----------------------------------------------------------------------
Enrico Weigelt, metux IT service -- http://www.metux.de/
phone: +49 36207 519931 email: weigelt@metux.de
mobile: +49 151 27565287 icq: 210169427 skype: nekrad666
----------------------------------------------------------------------
Embedded-Linux / Portierung / Opensource-QM / Verteilte Systeme
----------------------------------------------------------------------
prev parent reply other threads:[~2011-09-18 19:19 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <10397477.30610.1305580263246.JavaMail.root@mail.hq.genarts.com>
2011-05-16 21:15 ` Maint-only commits Stephen Bash
2011-05-16 22:05 ` Junio C Hamano
2011-05-17 14:20 ` Stephen Bash
2011-05-17 15:13 ` Jay Soffian
2011-09-18 19:11 ` Enrico Weigelt [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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110918191120.GA6334@nibiru.local \
--to=weigelt@metux.de \
--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.
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 NNTP newsgroup(s).