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

Applying changes across divergent branches

From
TSTom Schutzer-Weissmann <tom.weissmann@siscog.pt>
Date
Sep 24, 2008, 14:40 UTC
Message-ID
<48DA514E.6060904@siscog.pt>
Hello all,
I am looking into how to apply git to some current working methods.

We tend to have two or three main branches: the development branch, and one or two product branches. The development branch is the cutting edge, and each product branches off from it.

While the product branch shares history with the development branch, not all changes to the development branch will get applied to the product branch. We tend to maintain two versions of a product at any time, meaning two divergent product branches.

Could we use git, or a tool based on git, to change on the development branch and selectively apply changes to the other branches - is it as simple as using git cherry-pick?

Thanks in advance, Tom SW

Next: Jeff King
Message 1 of 2 in “Applying changes across divergent branches”
  1. Tom Schutzer-WeissmannSep 24, 2008
  2. Jeff KingSep 24, 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.