git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Maint-only commits

From
Jay Soffian <jaysoffian@gmail.com>
Date
May 17, 2011, 15:13 UTC
Message-ID
<BANLkTinAGwJvJuZ_1Y1SK_EhrC0bj2cHHw@mail.gmail.com>
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.
Previous: Stephen BashNext: Enrico Weigelt
Message 4 of 5 in “Maint-only commits”
  1. Stephen BashMay 16, 2011
  2. Junio C HamanoMay 16, 2011
  3. Stephen BashMay 17, 2011
  4. Jay SoffianMay 17, 2011
  5. Enrico WeigeltSep 18, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.