Re: Usage of pull rebasing and merges

2011-02-08 Thread Wolfgang Rohdewald
On Dienstag 08 Februar 2011, Christoph Feck wrote: > I don't want to. Not yet. But the more I read here, the more > confused I get. the book "Pro Git" was/is very helpful for me and easy to read. However my copy from 2009 does not mention rerere yet http://progit.org/2010/03/08/rerere.html -- W

Re: Usage of pull rebasing and merges

2011-02-08 Thread Christoph Feck
> > oh, well. i give up. I don't want to. Not yet. But the more I read here, the more confused I get. Christoph Feck (kdepepo)

Re: Usage of pull rebasing and merges

2011-02-08 Thread Sebastian Trüg
Hi Ben, thanks for clarifying. :) Another point to add to my growing list of git tips. Cheers, Sebastian On 02/08/2011 10:08 AM, Ben Cooksley wrote: > On Tue, Feb 8, 2011 at 9:49 PM, Sebastian Trüg wrote: >> Hi Ben, >> >> could you please elaborate on this. I do not understand the problem at >>

Re: [Kde-scm-interest] Re: Usage of pull rebasing and merges

2011-02-08 Thread Alexander Neundorf
On Tuesday 08 February 2011, Boudewijn Rempt wrote: > On Tuesday 08 February 2011, Oswald Buddenhagen wrote: > > > - just throw away the merge with git reset --hard HEAD~1 and redo it > > > after git pull-ing. preferably, you should have git rerere enabled, > > > so you won't have to repeat res

Re: [Kde-scm-interest] Re: Usage of pull rebasing and merges

2011-02-08 Thread Boudewijn Rempt
On Tuesday 08 February 2011, Oswald Buddenhagen wrote: > > - just throw away the merge with git reset --hard HEAD~1 and redo it > > after git pull-ing. preferably, you should have git rerere enabled, > > so you won't have to repeat resolving any possible conflicts. Excuse my ignorance... But w

Re: Usage of pull rebasing and merges

2011-02-08 Thread Oswald Buddenhagen
On Tue, Feb 08, 2011 at 09:20:55PM +1300, Ben Cooksley wrote: > Do not run "git pull --rebase" after performing the merge, under any > circumstances. > ding ding ding - bingo! On Wed, Feb 02, 2011 at 10:27:02AM +0100, Oswald Buddenhagen wrote: > and remember that following receipes does *not* wor

Re: Usage of pull rebasing and merges

2011-02-08 Thread Ben Cooksley
On Tue, Feb 8, 2011 at 10:19 PM, David Jarvie wrote: > On Tue, February 8, 2011 9:08 am, Ben Cooksley wrote: >> On Tue, Feb 8, 2011 at 9:49 PM, Sebastian Trüg wrote: >>> Hi Ben, >>> >>> could you please elaborate on this. I do not understand the problem at >>> all. What is so bad about rebasing a

Re: Usage of pull rebasing and merges

2011-02-08 Thread David Jarvie
On Tue, February 8, 2011 9:08 am, Ben Cooksley wrote: > On Tue, Feb 8, 2011 at 9:49 PM, Sebastian Trüg wrote: >> Hi Ben, >> >> could you please elaborate on this. I do not understand the problem at >> all. What is so bad about rebasing and what is wrong with the commit you >> mention? >> >> Cheers

Re: Usage of pull rebasing and merges

2011-02-08 Thread Ben Cooksley
On Tue, Feb 8, 2011 at 9:49 PM, Sebastian Trüg wrote: > Hi Ben, > > could you please elaborate on this. I do not understand the problem at > all. What is so bad about rebasing and what is wrong with the commit you > mention? > > Cheers, > Sebastian Hi Sebastian, The problem in this case isn't re

Re: Usage of pull rebasing and merges

2011-02-08 Thread Sebastian Trüg
Hi Ben, could you please elaborate on this. I do not understand the problem at all. What is so bad about rebasing and what is wrong with the commit you mention? Cheers, Sebastian On 02/08/2011 09:20 AM, Ben Cooksley wrote: > Hi all, > > Just a word of warning, if you are going to merge two bran

Usage of pull rebasing and merges

2011-02-08 Thread Ben Cooksley
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 conducted the merge, use "git pull" if you encounter a non-fast forward error. Do not run "git pull --rebase" after performing the merge