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

Nicer UX for handling merge conflicts #45

Open

maghoff opened this issue Nov 21, 2017 · 1 comment

Owner

maghoff commented Nov 21, 2017

No description provided.

vi commented Dec 1, 2017 •

edited

Maybe it can use actual Git + wiggle for merging and offer resolution options like a mergetool?

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