On Tuesday 08 February 2011 17:55:03 Alexander Neundorf wrote: > 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...
Excuse my ignorance(*), but when all that matters (things like releases) happen in one central repository, why not just use a central repository system that just doesn't allow all these ugly things? And maybe doesn't have such a steep learning curve? Have fun, Arnold (*) I have yet to see the advantage of fragmented (aka decentralized) version control systems in general and git specially.
signature.asc
Description: This is a digitally signed message part.
>> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<
