我对git还非常陌生,正在努力弄清楚所有的工作原理。这是我的情况:我一直在笔记本电脑上开发Java项目。将其推送到git存储库并在另一台机器上拉取它。进行了一些更改并将其推送到存储库。现在我想将我当前的工作拉回我的笔记本电脑,但是它说我无法这样做,因为有未合并的文件。
Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>'
请帮忙纠正这个问题。谢谢。
$ git status
on branch master
Your branch is ahead of 'origin/master' by 1 commit.
(use "git push" to publish your local commits)
You have unmerged paths.
(fix conflicts and run "git commit")
git status
的输出。 - Code-Apprentice