git 进行Amend时遇到的问题

git push时报错：

wuqi@wuqideMacBook-Air psmp-new % git push
warning: redirecting to http://192.168.1.42:8929/xxx/psmp-new.git/
To http://192.168.1.42:8929/xxx/psmp-new
 ! [rejected]          develop -> develop (non-fast-forward)
error: failed to push some refs to 'http://192.168.1.42:8929/xxx/psmp-new'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

解决方案一：

wuqi@wuqideMacBook-Air psmp-new % git pull --rebase origin develop

* 然后解决冲突

最后git push