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

Question: next, master and pu branches

From
ALAlexander Litvinov <lan@academsoft.ru>
Date
Feb 2, 2007, 05:41 UTC
Message-ID
<200702021141.53997.lan@academsoft.ru>
Hello,

Can somebody explain the meaning of next and pu branches and some documenation about using topic branches.

My development model use two branches now: stable release and develment branch. All changes in the stable release branch are bug-fix only changes. All (or most) of them must go to development release. Now I do this using cherry-pick but it is not easy to track what was merged especialy when merge pruduce confic resloved by hands. Stable branch live long life, much more than 100 commits.

It seems topic branches can help me here, but reading Documentation under git sources teach to make topic branch from the branch point and then merge it to both branches. This can work while stable branch has short life and was not heavily rewritten. 

If there any technique that can help me ?
Message 1 of 1 in “Question: next, master and pu branches”
  1. Alexander LitvinovFeb 2, 2007

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.