Please don't rebase / ff the git master branches

[Russel Winder]

On Mon, 2013-11-18 at 08:57 +0100, Jacob Carlborg wrote:
> On 2013-11-16 13:47, Russel Winder wrote:
> 
> > I always thought it was de rigueur never to rebase a publicly published
> > repository.
> 
> I think the idea is to rebase the topic branch. Make sure all new 
> changes to master comes first, then the changes to the topic branch.

As a technique for merging in a feature branch to the mainline with Git,
this can work – the problem is dealing with reverse merges caused
reordering, but if this history revisionism is allowed then fine.
Mercurail is a different situation, but is not relevant here.

> Usually it's perfectly fine to rebase topic branches and other temporary 
> branches. You might want to be careful if you're collaborating with 
> someone else on that branch.

I think we are agreeing and saying the same thing really, once a branch
or tag is made public it shouldn't be rebased.

-- 
Russel.
=============================================================================
Dr Russel Winder      t: +44 20 7585 2200   voip: sip:russel.winder at ekiga.net
41 Buckmaster Road    m: +44 7770 465 077   xmpp: russel at winder.org.uk
London SW11 1EN, UK   w: www.russel.org.uk  skype: russel_winder