Olivers-MacBook-Pro:incrementum oliverpike$ git merge master
CONFLICT (content): Merge conflict in src/components/StudyPanel/StudyPanel.less
CONFLICT (content): Merge conflict in server/routes/index.js
CONFLICT (add/add): Merge conflict in server/routes/dispute/validator.js
CONFLICT (content): Merge conflict in npm-shrinkwrap.json
CONFLICT (add/add): Merge conflict in migrations/20170909131130-responses.js
Recorded preimage for 'migrations/20170909131130-responses.js'
Recorded preimage for 'npm-shrinkwrap.json'
Recorded preimage for 'server/routes/dispute/validator.js'
Recorded preimage for 'server/routes/index.js'
Recorded preimage for 'src/components/StudyPanel/StudyPanel.less'
Automatic merge failed; fix conflicts and then commit the result.
You should try and merge the PR branch locally to see what those conflicts are:
git fetch git checkout -b pull/ID/head BRANCHNAME git checkout master git merge BRANCHNAME
(instead of merging master)
You should get conflicts for you to resolve (or to mention to the author of that PR, for him/her to resolve and update his/her PR)