On Tue, Feb 8, 2011 at 13:45, David Faure wrote:
> While I very much agree with you on the very steep learning curve, I have to
> say that every time I use "svn blame" and I end up on a "merged branch foo"
> huge commit, I curse at svn's inability to preserve branch history.
>
> This is one of the
On Tuesday 08 February 2011, Arnold Krille wrote:
> 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
- Original Message -
> 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?
+1!
Best,
--
Tom Albers
KDE Sysadmin
>> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscri
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. prefera
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
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
