incubator-flex-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Gordon Smith <gosm...@adobe.com>
Subject RE: [DISCUSS] Re: [VOTE] Branching Strategy and SCM
Date Tue, 14 Aug 2012 00:19:35 GMT
How does Git make merges better than in SVN?

- Gordon

-----Original Message-----
From: Omar Gonzalez [mailto:omarg.developer@gmail.com] 
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.  
> Which is valid, but the logic about when to branch/merge seems to apply to 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 matter of which tool
is going to handle these workflows better. Git will handle these workflows better because
branching is its killer feature. In SVN branching is the feature that kills it, if you run
into merge hell.

-omar

Mime
View raw message