Re: Fwd: Usage of pull rebasing and merges

2011-02-08 Thread Cyrille Berger Skott
On Tuesday 08 February 2011, Boudewijn Rempt wrote: > Just thought I'd forward this stern warning! Yup and after seeing the discussion between Ben and Thiago on IRC... I suspect that is exactly what happened to me on Sunday. -- Cyrille Berger Skott ___

Fwd: Usage of pull rebasing and merges

2011-02-08 Thread Boudewijn Rempt
Just thought I'd forward this stern warning! -- Boudewijn Rempt | http://www.valdyas.org, http://www.krita.org --- Begin Message --- Hi all, Just a word of warning, if you are going to merge two branches together, make sure to run "git pull --rebase" before you conduct the merge. Once you have co