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

Re: Merge priority

From
Alex Riesen <raa.lkml@gmail.com>
Date
Nov 26, 2009, 15:42 UTC
Message-ID
<81b0412b0911260742l4beb2305y87c01dd61d7c2b57@mail.gmail.com>
In-Reply-To
<26ae428a0911260444j45437a92r47d7f2e8b292829e@mail.gmail.com>
On Thu, Nov 26, 2009 at 13:44, Howard Miller <howard@e-learndesign.co.uk> wrote:
Show 5 quoted lines
> I now want to update all my customer branches with the latest fixes
> and patches. Naively, I would just check out each branch and merge the
> stable branch - job done. However, is it sensible to ask if there is a
> way to say that the stable branch is more important if there are
> conflicts.

No, all branches are equal. Besides, are you sure it is safe to just take your stable version of the code in a conflict? Maybe the stable code uses something a customer branch renamed or removed?

You can take a look at rerere, though. It should help resolving repeating conflicts by recording a resolution of your choice.

Previous: Howard MillerNext: Junio C Hamano
Message 2 of 4 in “Merge priority”
  1. Howard MillerNov 26, 2009
  2. Alex RiesenNov 26, 2009
  3. Junio C HamanoNov 26, 2009
  4. Martin LanghoffNov 26, 2009

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.