Resolve merge conflicts on GitHub
Merge conflict Merge conflict happens when two branches modify the same file and the same line of code. Git will not merge the branches automatically but displays the error message. We need to resolve all merge conflicts in order to merge a pull request successfully. Resolve conflict Simple merge conflicts can be resolved by […]