root@hyk-virt:/etc# git status
# On branch master
# Your branch and 'origin/master' have diverged,#
阅读背景：
[置顶] git pull报错：Auto Merge Failed; Fix Conflicts and Then Commit the Result.
来源：互联网
root@hyk-virt:/etc# git status
# On branch master
# Your branch and 'origin/master' have diverged,#
分享到：
