From: Jay Soffian <jaysoffian@gmail.com>
To: Stephen Bash <bash@genarts.com>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: Maint-only commits
Date: Tue, 17 May 2011 11:13:55 -0400 [thread overview]
Message-ID: <BANLkTinAGwJvJuZ_1Y1SK_EhrC0bj2cHHw@mail.gmail.com> (raw)
In-Reply-To: <32603283.31527.1305642038158.JavaMail.root@mail.hq.genarts.com>
On Tue, May 17, 2011 at 10:20 AM, Stephen Bash <bash@genarts.com> wrote:
> That's certainly a valid approach. I discussed it around the office and got push back on adding additional complexity to our branching model. So I'll document the "our" merge approach and perhaps revisit the branching model at the beginning of the next development cycle.
At @work we use something like this. We have three branches:
- trunk (aka master, but it started as a git-svn branch long ago...)
- release
- maint
Our maint merges to both trunk and release, via an automated process
except when a conflict requires human intervention.
Occasionally someone will put something on trunk by accident that
should've gone to maint. We revert it from trunk, cherry-pick to
maint, and let it merge back down.
(Aside, I've found hudson^wjenkins to be great for misc jobs like this
and prefer it to cron these days for non-sytem-related periodic
events.)
j.
next prev parent reply other threads:[~2011-05-17 15:14 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 [this message]
2011-09-18 19:11 ` Enrico Weigelt
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=BANLkTinAGwJvJuZ_1Y1SK_EhrC0bj2cHHw@mail.gmail.com \
--to=jaysoffian@gmail.com \
--cc=bash@genarts.com \
--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.
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).