How to Resolve Merge Conflicts in Git | How To Resolve Merge Conflicts Between Branches In Git
Conflicts generally arise when two people have changed the same lines in a file, or if one developer deleted a file while another developer was modifying it. In these cases, Git cannot automatically determine what is correct. ... Git will mark the file as being conflicted and halt the merging process.