Question

我最近在我的机器上重新安装了Ubuntu并备份了所有文件和文件夹。我正在使用PyCharm将我的本地文件与bitbucket上的存储库同步。我已经看过许多关于如何为新存储库执行此操作的教程，但是如果项目已经存在，我没有看到如何执行此操作PLUS您在项目中存在.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 push

，这就是我得到的

alfredo@alfpc-ubuntu:~/Dropbox/Alfredo1/Caffe$ git push
Username for 'https://bitbucket.org': alfredox10
Password for 'https://alfredox10@bitbucket.org': 
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 pull并再次尝试。

alfredo@alfpc-ubuntu:~/Dropbox/Alfredo1/Caffe$ git pull
Cannot pull with rebase: You have unstaged changes.
Please commit or stash them.

但我不得不隐藏变化。

alfredo@alfpc-ubuntu:~/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，使我的本地文件与服务器上的文件相同。

alfredo@alfpc-ubuntu:~/Dropbox/Alfredo1/Caffe$ git pull
Username for 'https://bitbucket.org': alfredox10
Password for 'https://alfredox10@bitbucket.org': 
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 push，现在我仍然得到这个。

alfredo@alfpc-ubuntu:~/Dropbox/Alfredo1/Caffe$ git push
Username for 'https://bitbucket.org': alfredox10
Password for 'https://alfredox10@bitbucket.org': 
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.

Answer 1

你必须首先添加这些文件并提交并推送它们：

git add .
git commit -m 'Your commit message'
git push

但是，从文件名中我猜它们是临时文件，你最好删除并忽略它们（在.gitignore中）：

*~

另外，就像@MikkoOhtamaa评论的那样，你可以创建一个新的存储库：

如果文件相同，只需从头开始重新创建一个新的存储库。这是最简单的解决方案。 - Mikko Ohtamaa 23小时前

如果你有一个包含以前.git文件的项目文件夹，如何设置bitbucket？

1 个答案: