incubator-flex-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Carlos Rovira <carlos.rov...@codeoscopic.com>
Subject Re: The Git Branching Model: Will it work with SVN?
Date Fri, 10 Aug 2012 07:52:20 GMT
> I'm thinking we won't switch
to Git until after Adobe donates 3.x at the earliest.

Alex, why Flex 3.x should be a showstopper for go to Git? I think it could
be donated to Apache SVN and then incorporate to Git when it comes the
time. I don't see the relation here, but a problem for Flex 4.x - 5.x
evolution that would be more easy by going git as soon as possible...



2012/8/10 Omar Gonzalez <omarg.developer@gmail.com>

> All merge of of trunk from unstable can cause conflicts if for example
> > someone deleted or renamed a file in one changeset and someone else
> > modified the same file in another changeset.
>
>
> This is also another issue that can be solved with using Git because of
> rebasing. Rebasing branches undoes all of the commits you've done up to the
> point at which you started the branch. It stores them away and then pulls
> down all of the new commits that were done on the parent that you created
> the branch from. Once it has all the commits they're reapplied to the
> branch in chronological order so you can maintain a perfect commit history
> and be able to resolve conflicts as they happen in small chunks as opposed
> to trying to resolve huge changesets like you do in SVN.
>
> Git, git, git!
>
> -omar
>



-- 
Carlos Rovira
Director de Tecnología
M: +34 607 22 60 05
F:  +34 912 35 57 77
<http://www.codeoscopic.com>
CODEOSCOPIC S.A. <http://www.codeoscopic.com>
Avd. del General Perón, 32
Planta 10, Puertas P-Q
28020 Madrid

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