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

git workflow - merging upwards

From
PSPatrick Sabin <patrick.just4fun@gmail.com>
Date
Aug 16, 2012, 19:49 UTC
Message-ID
<502D4EAE.9010704@gmail.com>

I read through gitworkflows and want to use the Merge Upwards rule in my projects:

"Always commit your fixes to the oldest supported branch that require them. Then (periodically) merge the integration branches upwards into each other."

This looks great but I have some trouble in the case if I want to have a change in an older branch and don't want to propagate the change to the newer branches. Let's say I have a v1.1 and a v1.2 and now a have a bug fix/workaround which only affects version v1.1 but not v1.2. If I commit to v1.1 then the periodical merge would merge the change to v1.2 which is what I don't want.

Any ideas/workarounds for that problem?

-- Patrick

Next: Junio C Hamano
Message 1 of 3 in “git workflow - merging upwards”
  1. Patrick SabinAug 16, 2012
  2. Junio C HamanoAug 16, 2012
  3. Patrick SabinAug 17, 2012

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.