[haiku-development] Re: [haiku] Subversion to Git migration scheduled for November 12, 2011

  • From: Travis Geiselbrecht <geist@xxxxxxxxxx>
  • To: haiku-development@xxxxxxxxxxxxx
  • Date: Fri, 4 Nov 2011 02:35:25 -0700

On Fri, Nov 4, 2011 at 2:33 AM, Ingo Weinhold <ingo_weinhold@xxxxxx> wrote:
> Travis Geiselbrecht wrote:
>> Good to see you're using 'git pull --rebase' and in general using a
>> 'rebase your local branch on the upstream branch instead of creating a
>> merge commit' strategy to dealing with local branches, especially
>> before pushing upstream. It's a bit more conceptually difficult, but
>> it's much nicer on the main repository when there aren't any more
>> extraneous merge commits than necessary. I don't know if this should
>> be the official policy, but it's one I've maintained at work for a few
>> years and it generally works well.
> That certainly is a good strategy for (smaller) changes one has done locally 
> only. It simply doesn't work for larger stuff that one also pushes to a 
> public repository (other than Haiku's main repo) while working on it and 
> maybe even collaborates with others, since the rebasing vanishes other 
> people's merge bases.

Yep, large collaborative topic branches are usually worth a merge back, I agree.

Other related posts: