Thomas Rast tr...@student.ethz.ch writes:
The REUC extension stores the stage 1/2/3 data of entries which were
marked resolved by the user, to enable 'git checkout -m name' to
restore the conflicted state later.
Yes.
When a file was deleted on one side of the merge and unmodified on the
The REUC extension stores the stage 1/2/3 data of entries which were
marked resolved by the user, to enable 'git checkout -m name' to
restore the conflicted state later.
When a file was deleted on one side of the merge and unmodified on the
other, merge-recursive uses remove_file_from_cache() to
Thomas Rast tr...@student.ethz.ch writes:
Thomas and me discovered this while hacking on index-v5. It would be
a bit tricky to handle there: the index is structured according to the
directory layout of the files it contains, and the REUC data is the
same as the conflict (stages) data plus a
3 matches
Mail list logo
