|
From: | Samuel Tardieu |
Subject: | [Gnu-arch-users] Re: how to recover from large conflicts? |
Date: | Thu, 25 Sep 2003 13:52:10 +0200 |
User-agent: | Gnus/5.090007 (Oort Gnus v0.07) XEmacs/21.5 (cauliflower, i386--freebsd) |
>>>>> "Denys" == duchier <address@hidden> writes: Denys> Now, try to take a diff of the "REMOTE" FILEs and apply it to Denys> the "LOCAL" FILE. Can you make this work? This is typically the case where I prefer it *not* to work and have a human handle this case. It is far too easy to mess up a Python program because the patch would apply with a bogus indentation. Sam -- Samuel Tardieu -- address@hidden -- http://www.rfc1149.net/sam
[Prev in Thread] | Current Thread | [Next in Thread] |