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 05:33:42 GMT
> >> In the Git Branching Model, you would do the merge, resolve conflicts
> and
> >> block manually resolved conflicts.
> > Which doesn't answer my question of how you would keep develop/unstable
> in
> > sync with the trunk. (See above).
> In the Git Branching Model, the trunk only receives merges from release
> branches.  The release branch gets synced with trunk and develop.  All
> changes to trunk that should be in develop should be in at that time.  It
> must be working satisfactorily otherwise it wouldn't have fans.
>

This is a little bit wrong.
In the Git Branching Model, trunk/master receives merges from release
branches and from hotfix branches, whenever there is something to be fixed
on a version that has already been deployed. Those hotfix branches are made
off a version tag. It works extremely well in Git, more on that in next
answer below.



>
> >
> >> I think the trunk history may not be any different if we use the Git
> >> Branching Model entirely in SVN because the only commit to trunk is
> from a
> >> release branch merge operation.
> > Can you think of any way to keep the revision history?
>

This model works very well in Git because of rebasing. You can read more
about Git rebase here: http://learn.github.com/p/rebasing.html
Rebasing is one of the reason this model works so well. It basically plays
back commits, in chronological order, so you can resolve conflicts as they
appear in smaller chunks as opposed to big huge merges like people usually
fear with SVN.


To be quite honest, I'm not entirely sure how well this scheme would work
with SVN, I think that it can work cleanly, but there may be some merging
pain that surfaces every now and then.

I think moving to Git sooner is better than waiting. I do understand the
SVN history concern, but that can still be imported into SVN and then
sync'd to Git once its been imported, I don't see any real reason for the
pending donations to be an obstacle on moving to Git for a better workflow.
Especially if we're moving to the Git branching model, then I don't see any
issues honestly.

-omar

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