正在使用Aptana Studio 3和Heroku進行RoR網站項目。當我通過GitHub'提交'後將我的網站推送到Heroku時,我不斷收到此錯誤。到處搜索,但無法找到我可以遵循的簡單解決方案。有什麼建議發生了什麼以及如何重新植入?謝謝。GitHub to Heroku提交錯誤
User$ git push heroku master
To [email protected]:xxxxxx.git
! [rejected] master -> master (non-fast forward)
error: failed to push some refs to '[email protected]:xxxxxx.git'
To prevent you from losing history, non-fast-forward updates were rejected.
Merge the remote changes before pushing again.
See 'non-fast forward' section of 'git push --help' for details.
User$
我想這個建議按照以下從@SkillDrick和得到這個加在最後的錯誤:
User$ git merge heroku/master master
usage: git merge [options] <remote>...
or: git merge [options] <msg> HEAD <remote>
-n do not show a diffstat at the end of the merge
--stat show a diffstat at the end of the merge
--summary (synonym to --stat)
--log add list of one-line log to merge commit message
--squash create a single commit instead of doing a merge
--commit perform a commit if the merge succeeds (default)
--ff allow fast forward (default)
-s, --strategy <strategy>
merge strategy to use
-m, --message <message>
message to be used for the merge commit (if any)
-v, --verbose be more verbose
-q, --quiet be more quiet
user$ git push heroku master
To [email protected]:worrybin.git
! [rejected] master -> master (non-fast forward)
error: failed to push some refs to '[email protected]:worrybin.git'
To prevent you from losing history, non-fast-forward updates were rejected.
Merge the remote changes before pushing again.
See 'non-fast forward' section of 'git push --help' for details.
當你做了'git合併heroku/master master'(我的錯誤),它說'使用率'等,這是告訴你,該命令是不正確的,所以它實際上並沒有合併。 – Skilldrick