Re: [cdt-dev] [egit-dev] Pull vs. Rebase

[James Blackburn <jamesblackburn@xxxxxxxxx>]

On 12 May 2011 16:49, Schaefer, Doug <Doug.Schaefer@xxxxxxxxxxxxx> wrote:

Could this be as a simple as not using Pull and using Fetch/Rebase instead?

Fundamentally it requires committers to understand when they should do a Fetch+Merge(Pull) or a Fetch+Rebase.  If they share a branch with others: on github or directly, then they should never rebase that branch (or they'll hurt downstream). Otherwise if they're formatting a commit for pushing into CDT they should rebase the patchset on top of the current branch's HEAD.    

In CVS they never had to make this distinction... Rebase can be dangerous, but the alternative of Pull + Push - which the UI leads you towards - will encourage sphagetti history.  We've seen this here in a shared central repository with a team of users new to git and egit... 

Cheers,

James