git fetch B + merge B和merge origin/B有什么区别?有什么区别git fetch B + git merge B vs git merge origin/B
$ git fetch origin develop
From [...]
* branch develop -> FETCH_HEAD
$ git merge develop
Already up-to-date.
$ git merge origin/develop
error: Your local changes to the following files would be overwritten by merge
...
在上述序列中我期望合并到输出相同,但结果是不同的。我预计“fetch”命令会在本地检索远程分支,以便它可用于本地合并操作。提取完成后,我期望从本地分支合并成为从原点合并的平等操作。这个期望我错了吗?
忘了提,我在功能/ XXX分支 – shamil