# gitLab提示 There are merge conflicts . [Merge Locally]
git pull报错:Auto Merge Failed; Fix Conflicts and Then Commit the Result.