lkml.org 
[lkml]   [2011]   [Jun]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: [PATCH] ide: Fix bug caused by git merge
Date
Linus Torvalds <torvalds@linux-foundation.org> writes:

> Git has wonderful support for helping resolve merges intelligently,
> but you need to know how to do it. See the gitk example above - run it
> and ponder.

Btw, when I redo the merge and let kdiff3 resolve the conflicts (via git
mergetool) it does exactly the right thing. :-)

Andreas.

--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."


\
 
 \ /
  Last update: 2011-06-01 22:59    [W:0.048 / U:7.224 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site