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.

Sign up for GitHub

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

Jump to bottom

Improve conflict resolution UI #49

Open

MariusDoe opened this issue Nov 18, 2024 · 0 comments

Labels

Collaborator

MariusDoe commented Nov 18, 2024 •

edited

Loading

accidentally clicking on a line will choose that version (maybe only add click handlers on the markers)
a side-by-side tool would be nice (like in VSCode or IntelliJ)
resolve to current/incoming also discards auto-merged changes

MariusDoe added the enhancement label

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment