Resolving Git merge conflicts

Question

A Git repository has been cloned on several developers\' local machines. Some changes have been made to the code in the repository. We\'re now getting the error:

<         


        

Answer 1

First you should:

git checkout -- public_html/sites/file
git checkout -- public_html/sites/file1.txt
git checkout -- public_html/sites/file2.txt

Next step:

git pull origin master