遇到这么一种情况，不知道该怎么办，求教~
本地和服务器处于同一个commit，然后我本地做了一些改动，commit了一下，使用 --amend，commit message没有动，然后此时我push，报错，大概就是本地和服务器不同步，然后我pull了一下，出现一些文件无法自动合并。这是我git status，出现：
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 1 and 1 different commit(s) each, respectively.
#
# Unmerged paths:
# (use "git add/rm <file>..." as appropriate to mark resolution)
#
# both modified: xxxx
# both modified: xxxx
# both modified: xxx
# both added: xxx
#
no changes added to commit (use "git add" and/or "git commit -a")
我也不记得究竟改过什么文件了，怕会不会我的改动被merge覆盖掉，还有现在应该怎么办。。。
本地和服务器处于同一个commit，然后我本地做了一些改动，commit了一下，使用 --amend，commit message没有动，然后此时我push，报错，大概就是本地和服务器不同步，然后我pull了一下，出现一些文件无法自动合并。这是我git status，出现：
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 1 and 1 different commit(s) each, respectively.
#
# Unmerged paths:
# (use "git add/rm <file>..." as appropriate to mark resolution)
#
# both modified: xxxx
# both modified: xxxx
# both modified: xxx
# both added: xxx
#
no changes added to commit (use "git add" and/or "git commit -a")
我也不记得究竟改过什么文件了，怕会不会我的改动被merge覆盖掉，还有现在应该怎么办。。。
Select Language