[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnu-arch-users] Re: how to recover from large conflicts?
From: |
duchier |
Subject: |
Re: [Gnu-arch-users] Re: how to recover from large conflicts? |
Date: |
Thu, 25 Sep 2003 15:56:31 +0200 |
User-agent: |
Gnus/5.1003 (Gnus v5.10.3) Emacs/21.3 (gnu/linux) |
Samuel Tardieu <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.
I tend to agree for Python, but imagine it's not Python - you didn't
think you could evade the issue quite so easily, did you? :-)
Cheers,
--
Denys Duchier - Équipe Calligramme - LORIA, Nancy, France
- [Gnu-arch-users] how to recover from large conflicts?, Denys Duchier, 2003/09/24
- [Gnu-arch-users] Re: how to recover from large conflicts?, Miles Bader, 2003/09/25
- Re: [Gnu-arch-users] how to recover from large conflicts?, Tom Lord, 2003/09/25
- Re: [Gnu-arch-users] how to recover from large conflicts?, Denys Duchier, 2003/09/25
- Re: [Gnu-arch-users] how to recover from large conflicts?, Tom Lord, 2003/09/25
Re: [Gnu-arch-users] how to recover from large conflicts?, Miles Bader, 2003/09/24