pm2 deploy ecosystem.json production执行报错

Question

$ pm2 deploy ecosystem.json production
–> Deploying to production environment
–> on host 47.99.159.102
○ deploying origin/master
○ executing pre-deploy-local
○ hook pre-deploy
root@47.99.159.102’s password:
○ fast forward master
root@47.99.159.102’s password:
Already on 'master’
M app.js
Your branch is ahead of ‘origin/master’ by 6 commits.
(use “git push” to publish your local commits)
From github.com:YUWA153/family-tradition

• branch master -> FETCH_HEAD
  Updating cbad6c1…cd6daae
  error: Your local changes to the following files would be overwritten by merge:
  app.js
  Please, commit your changes or stash them before you can merge.
  Aborting

git pull failed

Deploy failed
1

Answer 1

Scott 2019-01-21 22:26:41

服务器上的文件被改动了，导致合并分支出错，你把服务器的 production 整个文件夹删掉，重新 pm2 setup 和 deploy production 试试看