fetch:從遠(yuǎn)程獲取最新版本到本地闪彼,不會(huì)自動(dòng)merge
用WebStormGit操作:
ctrl+shift+A -> fetch -> show diff for selected change -> merge
用fetch比較安全,比較本地的分支與遠(yuǎn)程分支的diff之后再?zèng)Q定是否要merge
pull:從遠(yuǎn)程獲取最新版本并merge到本地
pull = fetch + merge
用WebStormGit操作:
ctrl+shift+A -> fetch -> show diff for selected change -> merge
用fetch比較安全,比較本地的分支與遠(yuǎn)程分支的diff之后再?zèng)Q定是否要merge
pull = fetch + merge