There are 2 commands in git that get the latest version from the remote branch to the Local:
1. Git fetch: the equivalent of getting the latest version from remote to local, not automatically merge
<p style= "margin:0px 0px 10px; padding:0px; " ><span style= "font-family: ' Trebuchet MS ', Tahoma, arial;line-height:19px; font-size:13px; " ><span class= "PLN" style= "color: #000000; line-height:23px;" > </span></span><br style= "line-height:23px;"/><span class= "PLN" style= "color: #000000; line-height:23px;" >git fetch Origin master</span><br style= "line-height:23px;"/><span class= "PLN" style= "color:# 000000;line-height:23px; " >git log </span><span class= "pun" style= "color: #66660; line-height:23px;" >-</span><span class= "PLN" style= "color: #000000; line-height:23px;" >p master</span><span class= "pun" style= "color: #66660; line-height:23px;" A. </span><span class= "PLN" style= "color: #000000; line-height:23px;" >origin</span><span class= "pun" style= "color: #66660; line-height:23px;" >/</span><span class= "PLN" style= "color: #000000; line-height:23px;" .; master</span><br style= "line-height:23px;"/><span class= "PLN" style= "color: #000000; Line-height: 23px; " >git merge Origin</span><span class= "pun" style= "color: #66660; line-height:23px;" >/</span><span class= "PLN" style= "color: #000000; line-height:23px;" >master</span></p>
The meaning of the above command:
First download the latest version from the Remote Origin master branch to the Origin/master branch
Then compare the differences between the local master branch and the Origin/master branch
The final merge
The above process can actually be done in a clearer way:
<p style= "margin:0px 0px 10px; padding:0px; " ><span style= "font-family: ' Trebuchet MS ', Tahoma, arial;font-size:12px;line-height:23px;" ><span style= "LINE-HEIGHT:19PX;" ><span class= "PLN" style= "color: #000000; line-height:23px;" >git fetch Origin Master</span><span class= "pun" style= "color: #66660; line-height:23px;" >:</span><span class= "PLN" style= "color: #000000; line-height:23px;" >tmp</span></span></span> <span style= "font-family: ' Trebuchet MS ', Tahoma, arial;font-size : 12px;line-height:23px; " ><span style= "LINE-HEIGHT:19PX;" ><span class= "PLN" style= "color: #000000; line-height:23px;" >git diff tmp </span></span></span> <span style= "font-family: ' Trebuchet MS ', Tahoma, arial;font-size:12px;line-height:23px; " ><span style= "LINE-HEIGHT:19PX;" ><span class= "PLN" style= "color: #000000; line-height:23px;" >git Merge Tmp</span></span></span></p>
Get the latest version from the remote to the local test branch
Then compare the merge
2. Git pull: the equivalent of getting the latest version from remote and merge to local
<p style= "margin:0px 0px 10px; padding:0px; line-height:23px; " ><span class= "PLN" style= "color: #000000;" >git Pull Origin master</span></p>
The above command is actually equivalent to git fetch and git merge
Git fetch is more secure in real-world use
Because before the merge, we can review the update and then decide whether the merge ends