From: PJ Weisberg <pj@irregularexpressions.net>
Date: Sun, 28 Aug 2011 19:42:55 GMT
Subject: Re: branch practice in my project
Message-ID: <CAJsNXTmWmuycf0+vJ_TqcnQSoB1uNpexOJc=Av4OvZ=v_cAVFA@mail.gmail.com>
In-Reply-To: <CAPgpnMQmLUcxfNBDO53=s1SfigJtq2zk4H+npZeX0B_Vf0FAuA@mail.gmail.com>

On Sun, Aug 28, 2011 at 2:23 AM, Lynn Lin <lynn.xin.lin@gmail.com> 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