Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge: Show conflicting keys #3338

Open
Chemin1 opened this issue Dec 16, 2019 · 2 comments
Open

Merge: Show conflicting keys #3338

Chemin1 opened this issue Dec 16, 2019 · 2 comments
Labels

Comments

@Chemin1
Copy link
Contributor

@Chemin1 Chemin1 commented Dec 16, 2019

Mentioned by @markus2330 here.

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?

@mpranj

This comment has been minimized.

Copy link
Member

@mpranj mpranj commented Dec 16, 2019

Thank you for looking into this!

Depending on the original KeySet size it might be cheaper to have the additional KeySet instead of marking them with metadata and then iterating again and collecting the correct Keys. It would depend on the rest of the logic.

@markus2330

This comment has been minimized.

Copy link
Contributor

@markus2330 markus2330 commented Jan 14, 2020

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.