git checkout master git pull git checkout <branch> git merge master [ ... resolve any conflicts ... ] git add [files that were conflicted] git commit git push
참고 :: https://stackoverflow.com/questions/56683681/this-branch-has-conflicts-that-must-be-resolved-but-its-already-merged