incubator-flex-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Omar Gonzalez <omarg.develo...@gmail.com>
Subject Re: The Git Branching Model: Will it work with SVN?
Date Fri, 10 Aug 2012 07:43:03 GMT
On Thu, Aug 9, 2012 at 11:16 PM, Justin Mclean <justin@classsoftware.com>wrote:

> HI,
>
> > If we could just switch to Git we wouldn't have any of these stupid
> > problems with merging to begin with.
>
> Or is using SVN by working in trunk or have short lived branches as
> needed. It's hot hard or complex when used that way. Why are we even
> considering using a tool in the way that is not recommended?
>

I just dont see a bunch of people working in the trunk being as efficient.
Having things in different branches with an organized workflow like the Git
Branching Model has very defined workflows for all of the aspect of a
project's lifecycle. The SVN document has 3 different approaches, The
Always Branch is closest to the Git Branching Model, if we had to stick
with SVN that's the option I would choose and I'd try to mimic the GBM
simply because of the good experiences I've had with it on teams I've
worked with.

Having lots of people moving things around in the trunk at any given time
is going to cause chaos. It will also make it more difficult to keep the
trunk in a ready to ship state.


>
> > Yes, I'm trying to push the conversation in the direction of switching
> the
> > entire SCM solution. It would be best for the project to step out of the
> > dark ages of SCM and into the new age.... ;-)
>
> I'd also be fine with using Git.
>
> But I think the issue it how will we using it not exactly which version
> control we use ie a single development/unstable branch or not, check into
> trunk or not etc etc
>

If we switched to Git then it'd have to be with the Git Branching Model. It
takes advantage of two of Gits most killer features, branching and
merging/rebasing. I really do think this project would run a lot smoother
if we moved to this pairing. A lot of people would be happier. You can
branch branch branch all day locally and its extremely fast. Its easy to
publish branches and share code between experimental branches with other
devs. Merges have way less problems because of the hash nature as opposed
to chronological timeline based revisions. That's why you can just move
commits from branch to branch with ease. There's so many benefits to it.

-omar

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message