0

我正在尝试将我们的 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 终端执行拉取时发生。

4

1 回答 1

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

决定哪个是正确的选择，删除另一个和所有的人字形和等号。

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

于 2013-10-31T11:58:03.190 回答