Re: [Gnu-arch-users] Re: Graphical merges

[Stefan Monnier]

>>>> Basically, instead of 3 trees, I'd rather have 1 tree where each changed
>>>> <file> is replaced by something like <file>.orig, <file>.ancestor, and
>>>> <file>.new.  We'd also invent some way to represent file move/add/delete.
>>>> Then the merge can be done file-by-file with an obviously
>>>> fail-safe behavior.
>>> 
>>> You mean, not operate in the project tree at all, so you can't hurt it.
>> No: the "1 tree" would be the project tree.

> So you're proposing renaming all files that changed in HIS to <file>.orig?

For example.  It could also keep the HIS in place and only add .ancestor (or
.orig) and .new.  I don't care much about such details.


        Stefan