Resolving merge conflicts

Conflicts occur when changes made in the local repository and the remote repository cannot be automatically reconciled by Git. When conflicts arise, Git will prompt you to resolve them by choosing which changes to keep or by manually editing the conflicting files.

You may come across a conflict that needs resolving before you can properly complete a merge. For example, if two or more members make changes on the same part of a file in two different branches (i.e., remote and local branches), Git cannot merge them automatically.

Git adds conflict-resolution markers to the conflicting file when this happens. The markers help you figure out which sections of the file need to be resolved manually.

In our example above, everything above ===== is your local content, and everything below comes from the remote branch.

You must resolve the conflicting parts as shown below before you can proceed with creating a merge commit.