Messages in this thread | | | From | Andreas Schwab <> | Subject | Re: [PATCH] ide: Fix bug caused by git merge | Date | Wed, 01 Jun 2011 22:57:45 +0200 |
| |
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."
| |