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 resolving any possible conflicts. > > Excuse my ignorance... But what is "git rerere"?
These emails are a clear sign to me that we need recommended workflows of how to do things... Alex >> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<
