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

Merge priority

From
Howard Miller <howard@e-learndesign.co.uk>
Date
Nov 26, 2009, 12:44 UTC
Message-ID
<26ae428a0911260444j45437a92r47d7f2e8b292829e@mail.gmail.com>
I'm not sure this is even a sensible question....

I have a whole bunch of customer branches with all manner of local tweaks and modifications. I also have a stable branch with all my security patches and bug fixes. They do share common ancestry.

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. Or should I be using rebase instead (which I still don't really understand). I'm trying to reduce my workload as there are loads of branches to do.

Cheers :-)
Next: Alex Riesen
Message 1 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.