Clearer idea of what to do with the conflicted merge #8
Description
Emphasize the semantics of each branch before causing the conflict. Use "git log a..b" to show the differing commits.
{{ message }}
Emphasize the semantics of each branch before causing the conflict. Use "git log a..b" to show the differing commits.