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: What would it take to move to Git?
Date Sun, 12 Aug 2012 05:51:51 GMT
On Saturday, August 11, 2012, Alex Harui wro
>
>
>
>
> On 8/11/12 2:45 AM, "Carlos Rovira" <carlos.rovira@codeoscopic.com<javascript:;>>
> wrote:
>
> > Hi Alex,
> >
> > great to see you on Git now! :)
> >
> >
> > When you want to plan a feature make a local branch to make your
> > development, better than start to make it directly on the initial branch.
> Why is using a local branch important?


A combination of the branching strategy and using 'git rebase' which helps
to have a cleaner repo history by playing back updates to the branch along
with yours in the right order, to resolve conflict as if both people were
committing one after the other.

It's the common practice because branching is fast and cheap (disk size).
It lets u 'go to town' on code that could lead to big changes while
committing often and not having to worry about committing things that
aren't complete. It's then up to you if you want to keep the branch local
until you finish, or you can publish it to the remote so another dev can
help you with it. You can merge commits from your local working copy from
the remote repo.


> > When you finish, merge with final. You can as well publish  your feature
> > branch in remote to let others see it and help with your feature.
> >
> > You must take into account that commits should be atomic in order to be
> >
> > Another great thing of Git is that when a released is planned the rest of
> > the time can continue working and commiting work without the need to
> > "freeze" commits due to the distributed nature of the system :)
> Is this because of a branching strategy or is there something about Git
> that
> makes this easier?



-omar

>
>

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