Mailing-List: contact flex-dev-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: flex-dev@incubator.apache.org
Received-SPF: pass (nike.apache.org: domain of gosmith@adobe.com designates
 64.18.1.21 as permitted sender)
From: Gordon Smith <gosmith@adobe.com>
To: "flex-dev@incubator.apache.org" <flex-dev@incubator.apache.org>
Date: Mon, 13 Aug 2012 17:19:35 -0700
Subject: RE: [DISCUSS] Re: [VOTE] Branching Strategy and SCM
Thread-Topic: [DISCUSS] Re: [VOTE] Branching Strategy and SCM
Thread-Index: Ac15sYQOzUEIKuG6SkyUvvdf/qj6iQAAN+bQ
Message-ID: 
 <149F8129B58B2D418508E63117D9C5419B3A545728@nambx05.corp.adobe.com>
References: 
 <CACK5iZe0urh828=trp4OpT8Rj5zNoN8eVvR0+feHuuX0v728qw@mail.gmail.com>
	<CC4EE05C.44712%aharui@adobe.com>
 <CAEFz_vuEbcwx4BMxN9msF2uCcqn6P60Q7ERs-5WR6q3Eu=e1DQ@mail.gmail.com>
In-Reply-To: 
 <CAEFz_vuEbcwx4BMxN9msF2uCcqn6P60Q7ERs-5WR6q3Eu=e1DQ@mail.gmail.com>
Accept-Language: en-US
Content-Language: en-US
acceptlanguage: en-US
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0

How does Git make merges better than in SVN?

- Gordon

-----Original Message-----
From: Omar Gonzalez [mailto:omarg.developer@gmail.com]=20
Sent: Monday, August 13, 2012 5:12 PM
To: flex-dev@incubator.apache.org
Subject: Re: [DISCUSS] Re: [VOTE] Branching Strategy and SCM

> SVN doesn't allow you to have more than one branch in your whiteboard?
>  Most
> of these arguments still seem to be about fear of merge-hell in SVN. =20
> Which is valid, but the logic about when to branch/merge seems to apply t=
o both.
>
> --
> Alex Harui
> Flex SDK Team
> Adobe Systems, Inc.
> http://blogs.adobe.com/aharui
>
>
I would agree that the branching strategy can apply to both, its just a mat=
ter of which tool is going to handle these workflows better. Git will handl=
e these workflows better because branching is its killer feature. In SVN br=
anching is the feature that kills it, if you run into merge hell.

-omar