commit了两次，结果git push提交时报这样的错

[Hello5230]

高手们，问下，我git向服务器上提前，commit了两次，结果git push提交时报这样的错，指点下

Counting objects: 198, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (109/109), done.
Writing objects: 100% (137/137), 405.67 KiB, done.
Total 137 (delta 74), reused 0 (delta 0)
remote: W refs/heads/intg/dev scm/p400_system hongyang.song DENIED by fallthru
remote: error: hook declined to update refs/heads/intg/dev
To git@10.114.110.37:scm/p400_system.git
! [remote rejected] intg/dev -> intg/dev (hook declined)
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'git@10.114.110.37:scm/p400_system.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again. See the
'Note about fast-forwards' section of 'git push --help' for details.

[Hello5230]

大虾们指点下嘛

[yuleyouxi]

是不是你的本地git库很久没更新了或者出啥问题了？ 先git pull --rebase下试试

[Hello5230]

git pull --rebase之后，报 Cannot pull with rebase: You have unstaged changes. Please commit or stash them.

[yuleyouxi]

那说明你有修改过的文件 git stash git pull --rebase （每次push之前最好这样做一次） git push .... 之后用git stash pop stash@{0}回复你之前修改的文件

[坏脾气的猪]

楼主最后咋解决的？

[drfxiaoliuzi]

4楼说的好，我按照4楼做的！