Jeff King <p...@peff.net> writes: > So I think we need to update twoway_merge to recognize unmerged entries, > which gives us two options: > > 1. Reject the merge. > > 2. Throw away the current unmerged entry in favor of the "new" entry > (when old and new are the same, of course; otherwise we would > reject). > > I think (2) is the right thing.
As "--reset" in "read-tree --reset -u A B" is a way to say "we know we are based on A and we want to go to B no matter what", I agree we should not reject the merge. With -m instead of --reset, I am not sure what the right semantics should be, though. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
