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

branch practice in my project

From
LLLynn Lin <lynn.xin.lin@gmail.com>
Date
Aug 28, 2011, 09:23 UTC
Message-ID
<CAPgpnMQmLUcxfNBDO53=s1SfigJtq2zk4H+npZeX0B_Vf0FAuA@mail.gmail.com>
Hi git experts,
     currently our project use git to manage source code,we only have
master branch to support development and release.However when we goes
into regression phase,code freeze will be runnning on master branch
and it will hold lots of patch in developers.
I want to use a new branch strategy  to resolve code freeeze issue
master   branch    ----1----2----3-----4-----5-----6-----7------8--->
                                     |                               |
 release                         3‘----4’---5‘                  7'----8'

our release sprint cycle is 3 weeks per sprint. when we start a new sprint,we can create a release branch and get the data back to master branch after the sprint is over

how to get the data back to master branch? I suggest we can merge release branch back, and others are afraid that merge conflict will be a big deal for us so they suggest we can double commit into master and release branch

what's your thoughts? Could you give me some suggestions?
Thanks in advance
Lynn
Next: PJ Weisberg
Message 1 of 2 in “branch practice in my project”
  1. Lynn LinAug 28, 2011
  2. PJ WeisbergAug 28, 2011

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.