当我尝试运行git push heroku master命令时,出现以下错误:
我能够使用"--force"将代码上传至Heroku,但为什么仍然出现错误?
编辑2:
运行"git pull heroku master"命令会产生以下结果:
matt@matt-desktop:~/Documents/Ruby/rails_projects/ninja_speak_app$ git push heroku master
To https://git.heroku.com/limitless-inlet-4477.git
! [rejected] master -> master (fetch first)
error: failed to push some refs to 'https://git.heroku.com/limitless-inlet-4477.git'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
这个仓库是昨天在Github上创建的,名为ninja_speak_app。在设置仓库时,我小心地没有初始化自述文件或许可证。
当我执行git pull命令时,会得到以下结果:
matt@matt-desktop:~/Documents/Ruby/rails_projects/ninja_speak_app$ git pull
Already up-to-date.
提交操作还显示所有内容已经是最新的:
matt@matt-desktop:~/Documents/Ruby/rails_projects/ninja_speak_app$ git commit -m "first commit"
On branch master
Your branch is up-to-date with 'origin/master'.
nothing to commit, working directory clean
编辑:运行 git push --force heroku master 后会出现以下情况:
matt@matt-desktop:~/Documents/Ruby/rails_projects/ninja_speak_app$ git push --force heroku master
Counting objects: 25701, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (25297/25297), done.
Writing objects: 100% (25701/25701), 104.98 MiB | 97.00 KiB/s, done.
Total 25701 (delta 322), reused 25668 (delta 309)
remote: Compressing source files... done.
remote: Building source:
remote:
remote: Build stream timed out, reverting to polling....
remote: ! Timeout reached polling for results.
remote:
To https://git.heroku.com/limitless-inlet-4477.git
! [remote rejected] master -> master (pre-receive hook declined)
error: failed to push some refs to 'https://git.heroku.com/limitless-inlet-4477.git'
我能够使用"--force"将代码上传至Heroku,但为什么仍然出现错误?
编辑2:
运行"git pull heroku master"命令会产生以下结果:
matt@matt-desktop:~/Documents/Ruby/rails_projects/ninja_speak_app$ git pull heroku master
warning: no common commits
remote: Counting objects: 69191, done.
remote: Compressing objects: 100% (45212/45212), done.
remote: Total 69191 (delta 17653), reused 68275 (delta 16751)
Receiving objects: 100% (69191/69191), 129.00 MiB | 884.00 KiB/s, done.
Resolving deltas: 100% (17653/17653), done.
From https://git.heroku.com/limitless-inlet-4477
* branch master -> FETCH_HEAD
* [new branch] master -> heroku/master
Auto packing the repository for optimum performance. You may also
run "git gc" manually. See "git help gc" for more information.
Counting objects: 673, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (594/594), done.
Writing objects: 100% (673/673), done.
Total 673 (delta 239), reused 0 (delta 0)
error: The following untracked working tree files would be overwritten by merge:
db/development.sqlite3
db/production.sqlite3
db/test.sqlite3
log/development.log
log/production.log
log/test.log
tmp/cache/assets/C12/AE0/sprockets%2Fc558458ba9671201141a50f2240184c9
...
...
Aborting
执行 git push heroku master 后,会出现以下结果:
matt@matt-desktop:~/Documents/Ruby/rails_projects/ninja_speak_app$ git push heroku master
To https://git.heroku.com/limitless-inlet-4477.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'https://git.heroku.com/limitless-inlet-4477.git'
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.
git pull
操作被中止了。请先提交你的工作再进行拉取操作,或者放弃更改,或者使用stash
命令。 - Andrew C