there are two commands in git to obtain the latest version from the remote branch to the local:
1. git fetch: equivalent to obtaining the latest version from a remote computer to a local computer, without automatic merge
git fetch origin master
git log-P master .. ORIGIN/Master
git merge origin/Master
meaning of the preceding commands:
first download the latest version from the master branch of the remote origin to the origin/Master branch
then compare the differences between the local master Branch and the origin/Master branch
final merge
the above process can be implemented in the following clearer ways:
git fetch origin master: TMP
git diff TMP
git merge TMP
obtain the latest version remotely to the local test branch.
comparison and merge
2. git pull: this is equivalent to obtaining the latest version from a remote machine and merge to the local machine
git pull origin master
the above command is actually equivalent to git fetch and git merge
in actual use, git fetch is safer
because we can check the update status before merge, and then decide whether to merge it