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

Re: How to merge branches except for one commit

From
Andrew Arnott <andrewarnott@gmail.com>
Date
May 29, 2008, 03:01 UTC
Message-ID
<216e54900805282001x299055c3r6cfffcebc61fa955@mail.gmail.com>
In-Reply-To
<32541b130805281942g2550cad9k7ba530c59e050aa4@mail.gmail.com>

Interesting. I think working in the maintenance branch and merging back into master should work... except when I'm in master when I find the bug and just fix it there without thinking.

The merge and revert idea is interesting. I may try that out in this case since I'm already stuck with lots of commits in master.

Regarding why I am porting more than just *some* commits to the maintenance branches, well, these are also stabilization branches before an initial vX.0 release, so in the month or so of stabilization there could be potentially be a great deal of work in master that I decide is worth releasing sooner rather than later. I guess it's not really a stabilization branch in that scenario either, so it's probably my fault trying to walk both sides of a line.

I appreciate the thoughts and critique. If anyone else has more thoughts please feel free to throw them in.

On Wed, May 28, 2008 at 7:42 PM, Avery Pennarun <apenwarr@gmail.com> wrote:
Show 21 quoted lines
> On 5/28/08, Andrew Arnott <andrewarnott@gmail.com> wrote:
>>  At some point, most or all the commits on master since branching off
>>  v1.0 I want to include in the v1.1 release.
>
> I think this is perhaps the root of your problem.  Normally people
> don't merge from master into their bugfix release; they do it the
> other way around, making bugfixes in the bugfix branch, and merging
> them occasionally into master.
>
> Or alternatively, they cherry pick just *some* of the changes from
> master back into the bugfix release, because presumably there are also
> a bunch of non-critical new feature patches sitting in master.
>
> If you really want to do it the way you described, an easy answer
> might be to just merge the entire master into v1.1, then "git revert"
> (in v1.1) the patch that changes the version number :)
>
> Have fun,
>
> Avery
>
-- 
Andrew Arnott
Previous: Avery PennarunNext: Andreas Ericsson
Message 3 of 7 in “How to merge branches except for one commit”
  1. Andrew ArnottMay 29, 2008
  2. Avery PennarunMay 29, 2008
  3. Andrew ArnottMay 29, 2008
  4. Andreas EricssonMay 29, 2008
  5. Junio C HamanoMay 29, 2008
  6. Imran M YousufMay 29, 2008
  7. Andrew ArnottMay 29, 2008

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.