[Git] 解決conflict (官方)

Step 1: From your project repository, bring in the changes and test.

git fetch origin
git checkout -b steven origin/steven
git merge master

Step 2: Merge the changes and update on GitHub.

git checkout master
git merge --no-ff steven
git push origin master

Conflict with binary files:

git checkout --theirs -- path/to/conflicted-file.txt

git checkout --ours -- path/to/conflicted-file.txt