0
我得到这个错误,现在我很害怕。为什么git push在git pull之后无法快进?
$ git pull
Already up-to-date.
$ git push
To [email protected]:Unroll-Me/unrollme_thumbnail_generator.git
! [rejected] master -> master (non-fast-forward)
我得到这个错误,现在我很害怕。为什么git push在git pull之后无法快进?
$ git pull
Already up-to-date.
$ git push
To [email protected]:Unroll-Me/unrollme_thumbnail_generator.git
! [rejected] master -> master (non-fast-forward)
也许你不在分支master
? git pull
只合并当前分支。
尝试
git checkout master
git pull origin master
git push
D'oh,我以为我确认了7次,但不是猜测。 – djechlin
是支什么你? (git status'输出的第一行) – Arjan