fetch:从远程获取最新版本到本地,不会自动merge
用WebStormGit操作:
ctrl+shift+A -> fetch -> show diff for selected change -> merge
用fetch比较安全,比较本地的分支与远程分支的diff之后再决定是否要merge
pull:从远程获取最新版本并merge到本地
pull = fetch + merge
用WebStormGit操作:
ctrl+shift+A -> fetch -> show diff for selected change -> merge
用fetch比较安全,比较本地的分支与远程分支的diff之后再决定是否要merge
pull = fetch + merge