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

Clearer idea of what to do with the conflicted merge #8

Open

pkgw opened this issue Jun 17, 2014 · 0 comments

Owner

pkgw commented Jun 17, 2014

Emphasize the semantics of each branch before causing the conflict. Use "git log a..b" to show the differing commits.

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