On Tue, 2012-07-31 at 19:46 +0200, Tobias Pankrath wrote: […] > Does that mean that you do > > git checkout featurebranch > git rebase master > git merge featurebranch // fast forward?
Rule 0: Never use rebase on a published repository. Rule 1: Never use rebase on a published repository. Rule 2: Never use rebase on a published repository. … but yes many people do use rebase on a private repository to create changesets for submission to review. There are many who think this is anathema as it changes history, but unless the repository has been published no-one can actually observe that. -- Russel. ============================================================================= Dr Russel Winder t: +44 20 7585 2200 voip: sip:russel.win...@ekiga.net 41 Buckmaster Road m: +44 7770 465 077 xmpp: rus...@winder.org.uk London SW11 1EN, UK w: www.russel.org.uk skype: russel_winder
signature.asc
Description: This is a digitally signed message part