Join GitHub today
GitHub is home to over 40 million developers working together to host and review code, manage projects, and build software together.Sign up
Currently the merge library counts the number of conflict but does not keep track of which keys produced the conflicts. However, UIs are interested in this information.
The C++ merge tool used an additional KeySet to collect those keys. We could also mark keys using metadata instead. Any other ideas for this?
Yes, I also think this is up to you. It should be as easy for the client as possible to inform the user about the conflicts. And it should also be hard to use it wrong, so it should be as unlikely as possible that someone confuses conflicts from an earlier merge attempt with the conflicts that occurred by the last invocation.