lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 01 Jun 2011 22:57:45 +0200 From: Andreas Schwab <schwab@...ux-m68k.org> To: Linus Torvalds <torvalds@...ux-foundation.org> Cc: Steven Rostedt <rostedt@...dmis.org>, Jens Axboe <jaxboe@...ionio.com>, LKML <linux-kernel@...r.kernel.org>, axboe <axboe@...nel.dk>, Andrew Morton <akpm@...ux-foundation.org>, Tejun Heo <tj@...nel.org>, Junio C Hamano <gitster@...ox.com> Subject: Re: [PATCH] ide: Fix bug caused by git merge Linus Torvalds <torvalds@...ux-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@...ux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists