From: Adam Monsen <haircut@gmail.com>
To: Michael J Gruber <git@drmicha.warpmail.net>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: release maintenance vs. release engineering (was: configuring cherry-pick to always use -x?)
Date: Tue, 15 Feb 2011 13:03:43 -0800 [thread overview]
Message-ID: <4D5AEA2F.9000606@gmail.com> (raw)
In-Reply-To: <4D5A401B.1050103@drmicha.warpmail.net>
Michael J Gruber wrote:
> I don't quite understand how cherry picks could conflict less then
> merges if the release branch contains fixes only.
The last time I experienced a painful merge from f-release to master, it
was because some files had been culled from master but left extant on
f-release. Not too hard to resolve, actually. But I really only needed
one change pulled into master, and when I cherry picked instead of
merging the whole branch, there were no conflicts, and master ended up
containing exactly what I wanted.
> My impression is that "f-release" actually
> mixes release engineering and maintenance. Two possible remedies:
>
> - Separate release engineering from maintenance and merge only the
> latter to master
Ah, thank you! This is invaluable advice. I think I'll go with this
option since mixing release engineering and maintenance is exactly what
I'm doing. Hopefully it's worth the added complexity of having another
public branch.
I pushed an example to https://github.com/meonkeys/releaseBranchDemo
that I'll share with my developers.
"git merge -sours" will definitely be something useful to add to the
quiver too.
next prev parent reply other threads:[~2011-02-15 21:03 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-14 17:19 configuring cherry-pick to always use -x? Adam Monsen
2011-02-14 18:09 ` Jay Soffian
2011-02-14 21:23 ` Junio C Hamano
2011-02-14 21:05 ` Junio C Hamano
2011-02-14 21:50 ` Adam Monsen
2011-02-15 8:58 ` Michael J Gruber
2011-02-15 9:18 ` Jonathan Nieder
2011-02-15 9:29 ` Michael J Gruber
2011-02-15 16:16 ` Jay Soffian
2011-02-15 21:03 ` Adam Monsen [this message]
2011-02-14 21:53 ` Jay Soffian
2011-02-15 9:38 ` Ivan Kanis
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=4D5AEA2F.9000606@gmail.com \
--to=haircut@gmail.com \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).