What a conflict is telling you

• A

  The same file was edited on both branches, which always requires manual merging

• B

  One branch is out of date and needs updating before it can be merged

• C

  The changes are logically incompatible and one of them is wrong

• D

  Two branches changed the same region and the tool cannot tell which to keep