2
这是发生了什么:混帐合并冲突修改 - “你的分支和‘产地/主’分道扬镳”
- 后最近提交给远程主,我做一个小小事改变我的地方回购
- 我添加
git commit --amend
并使该相同的提交信息的HEAD - 我试图推动回购与
git push
掌握和现在我得到
On branch master
Your branch and 'origin/master' have diverged,
and have 1 and 1 different commit each, respectively.
(use "git pull" to merge the remote branch into yours)
nothing to commit, working directory clean
我想明白了:
- 为什么这到底会发生?
- 我能做些什么来防止这种情况?
- git修改后如何协调master和local?