我最近在我的機器上重新安裝了Ubuntu,並對所有文件和文件夾進行了備份。我正在使用PyCharm將本地文件與bitbucket上的存儲庫同步。我已經看到了很多關於如何爲NEW存儲庫執行此操作的教程,但是如果您的項目已經存在,那麼我沒有看到如何執行此操作,而且您已經在項目中存在.git文件。當你有一個以前的.git文件的項目文件夾時如何設置bitbucket?
我已經下載到位桶插件,設置我的遙控器,並測試了連接,但我不斷收到這個錯誤,當我試圖把文件:
Commit failed with error:
On branch master
Changes not staged for commit:
modified: Detection-alf/loadTrainingImages.py~
modified: automated-detection-for-alf/bibsmart_auto_detector.py~
modified: automated-detection-for-alf/bibsmart_verify_csv.py~
這是我所得到的,如果我做的git推
[email protected]:~/Dropbox/Alfredo1/Caffe$ git push
Username for 'https://bitbucket.org': alfredox10
Password for 'https://[email protected]':
To https://bitbucket.org/alfredox10/bibsmart_detection
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'https://bitbucket.org/alfredox10/bibsmart_detection'
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拉,並再次嘗試。
[email protected]:~/Dropbox/Alfredo1/Caffe$ git pull
Cannot pull with rebase: You have unstaged changes.
Please commit or stash them.
但是我不得不隱藏所做的修改。
[email protected]:~/Dropbox/Alfredo1/Caffe$ git stash
Saved working directory and index state WIP on master: df3e5e0 terminal git test commit
HEAD is now at df3e5e0 terminal git test commit
最後我做了git pull,使我的本地文件與服務器上的文件相同。
[email protected]:~/Dropbox/Alfredo1/Caffe$ git pull
Username for 'https://bitbucket.org': alfredox10
Password for 'https://[email protected]':
From https://bitbucket.org/alfredox10/bibsmart_detection
* branch master -> FETCH_HEAD
Auto packing the repository for optimum performance. You may also
run "git gc" manually. See "git help gc" for more information.
Counting objects: 159251, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (159214/159214), done.
Writing objects: 100% (159251/159251), done.
Total 159251 (delta 15072), reused 0 (delta 0)
Removing duplicate objects: 100% (256/256), done.
fatal: Needed a single revision
invalid upstream 24c9aac9a2eccf4313835cf89f7ece050e049d46
我做了git再次推,現在我仍然得到這個。
[email protected]:~/Dropbox/Alfredo1/Caffe$ git push
Username for 'https://bitbucket.org': alfredox10
Password for 'https://[email protected]':
To https://bitbucket.org/alfredox10/bibsmart_detection
! [rejected] master -> master (fetch first)
error: failed to push some refs to 'https://bitbucket.org/alfredox10/bibsmart_detection'
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.
我只是建議從命令行使用複製粘貼指令來做到這一點,當你通過網絡創建一個新的項目時,Bitbucket會給出它。 –
我做到了,仍然不幸。 – alfredox
您推送的存儲庫不是空的。 –