Thomas Gummerer <t.gumme...@gmail.com> writes: > I think I got the right solution for that in patch 5, with deleting > the file if it's deleted in "their" version and we pass --theirs to > 'git checkout', and analogous for --ours. I was just wondering if > there were any further edge cases that I can't think of right no.
That sounds quite sensible.
