{"thread":{"id":"28242","subject":"branch practice in my project","startedAt":"2011-08-28T09:23:06Z","lastAt":"2011-08-28T19:42:55Z","messageCount":2,"participants":["Lynn Lin","PJ Weisberg"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"174410","messageId":"CAPgpnMQmLUcxfNBDO53=s1SfigJtq2zk4H+npZeX0B_Vf0FAuA@mail.gmail.com","threadId":"28242","inReplyTo":null,"subject":"branch practice in my project","fromName":"Lynn Lin","fromEmail":"lynn.xin.lin@gmail.com","sentAt":"2011-08-28T09:23:06Z","receivedAt":"2011-08-28T09:23:06Z","isPatch":false,"sender":{"key":"lynn.xin.lin@gmail.com","avatar":null},"body":"Hi git experts,\n     currently our project use git to manage source code,we only have\nmaster branch to support development and release.However when we goes\ninto regression phase,code freeze will be runnning on master branch\nand it will hold lots of patch in developers.\n\nI want to use a new branch strategy  to resolve code freeeze issue\n\n\nmaster   branch    ----1----2----3-----4-----5-----6-----7------8--->\n                                     |                               |\n release                         3‘----4’---5‘                  7'----8'\n\nour release sprint  cycle is 3 weeks per sprint. when we start  a new\nsprint,we can create a release branch and get the data back to master\nbranch after the sprint is over\n\nhow to get the data back to master branch?   I  suggest we can merge\nrelease branch back, and others are afraid that merge conflict will be\na big deal for us so they suggest we can double commit into master and\nrelease branch\n\nwhat's your thoughts? Could you give me some suggestions?\n\nThanks in advance\n\nLynn\n"},{"id":"174427","messageId":"CAJsNXTmWmuycf0+vJ_TqcnQSoB1uNpexOJc=Av4OvZ=v_cAVFA@mail.gmail.com","threadId":"28242","inReplyTo":"CAPgpnMQmLUcxfNBDO53=s1SfigJtq2zk4H+npZeX0B_Vf0FAuA@mail.gmail.com","subject":"Re: branch practice in my project","fromName":"PJ Weisberg","fromEmail":"pj@irregularexpressions.net","sentAt":"2011-08-28T19:42:55Z","receivedAt":"2011-08-28T19:42:55Z","isPatch":false,"sender":{"key":"pj@irregularexpressions.net","avatar":"https://gravatar.com/avatar/aa2c1edcc61b536cc5c9f37fbce084e655446e2309f9818d43f13d47304a602b?d=mp&s=160"},"body":"On Sun, Aug 28, 2011 at 2:23 AM, Lynn Lin <lynn.xin.lin@gmail.com> wrote:\n\n> how to get the data back to master branch?   I  suggest we can merge\n> release branch back, and others are afraid that merge conflict will be\n> a big deal for us so they suggest we can double commit into master and\n> release branch\n\nI don't see how anyone would think \"double commits\" would be *less*\nwork than resolving merge conflicts.  (Espically if most changes don't\neven conflict.)\n\nThe only reason I can think of for not merging release back into\nmaster is if there are some changes on release that you don't want in\nmaster.\n\n-PJ\n"}]}