由于文件未合并，无法进行拉取

Question

我正在尝试将django项目部署到AWS。 我们处理部署的fabfile使用git pull（当然）。 在提取期间，我们收到以下错误：

[ec2-54-215-107-223.us-west-1.compute.amazonaws.com] Executing task 'deploy'
[ec2-54-215-107-223.us-west-1.compute.amazonaws.com] run: git pull origin master
[ec2-54-215-107-223.us-west-1.compute.amazonaws.com] out: U impact/c/views.py
[ec2-54-215-107-223.us-west-1.compute.amazonaws.com] out: Pull is not possible because you have unmerged files.
[ec2-54-215-107-223.us-west-1.compute.amazonaws.com] out: Please, fix them up in the work tree, and then use 'git add/rm <file>'
[ec2-54-215-107-223.us-west-1.compute.amazonaws.com] out: as appropriate to mark resolution, or use 'git commit -a'.
[ec2-54-215-107-223.us-west-1.compute.amazonaws.com] out: 


Fatal error: run() received nonzero return code 1 while executing!

现在，我知道还有其他一些用户在此处发布此问题，并且当我说我阅读了很多内容时，请相信我，但似乎没有一个对我们有用。 本地提交时没有合并/冲突错误，该错误似乎仅在我们从AWS服务器的SSH终端执行拉取时发生。

Answer 1

编辑impact/c/views.py （在vim，nano或emacs中），您将在其中的一个或多个部分

some stuff
>>>>>>>>>>>
(first alternative for conflict)
which may span one or more lines
===========
(second alternative for conflict)
which also may span
one or more lines
<<<<<<<<<<<
other stuff

确定哪个是正确的替代方案，删除另一个和所有V形和等号。

进行git commit -a -m"fixed views.py" ，然后git push origin master 。