# branch practice in my project 2 messages from 2011-08-28 to 2011-08-28. Participants: Lynn Lin, PJ Weisberg. Thread: https://gitlist.dev/t/28242 ## Lynn Lin, 2011-08-28 09:23 Subject: branch practice in my project Message-ID: URL: https://gitlist.dev/e/CAPgpnMQmLUcxfNBDO53%3Ds1SfigJtq2zk4H%2BnpZeX0B_Vf0FAuA%40mail.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 ``` ## PJ Weisberg, 2011-08-28 19:42 Subject: Re: branch practice in my project Message-ID: URL: https://gitlist.dev/e/CAJsNXTmWmuycf0%2BvJ_TqcnQSoB1uNpexOJc%3DAv4OvZ%3Dv_cAVFA%40mail.gmail.com In-Reply-To: ``` On Sun, Aug 28, 2011 at 2:23 AM, Lynn Lin wrote: > 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 I don't see how anyone would think "double commits" would be *less* work than resolving merge conflicts. (Espically if most changes don't even conflict.) The only reason I can think of for not merging release back into master is if there are some changes on release that you don't want in master. -PJ ```