git复制本地文件夹覆盖在线仓库

Question

So I've copied a local git folder, and made a lot of changes in it. I would like to overwrite the online repo with this new one (so basically remove the link with the previous one, and copy this new one to the online repo and go from there on).

So far I tried:

git push -f origin master

and this did what I wanted (it seems). But now if I want to push, I first get the message:

 git push --set-upstream origin master

Then after doing that: error: failed to push some refs to 'git@bitbucket.org:**************' 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: (eg, 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details.

I understand it's because my other folder is interfering? But I'm afraid to pull the repo in, because it will overwrite my local folder?

So I tryd to remove the git in the original folder, but that's not helping.

So now my question: How can I overwrite the online repo with this new local repo and start from there on?

Thank you for your help!

Answer 1

The OP has answered the question, but that is not the correct way to do things in git. Hence, suggesting a generally followed approach

---

You can follow the below procedure

1) do git pull .

2) It may ask you to commit or stash the changes if there would be conflicts. If it doesn't then skip step 3

3) if it does, then do git stash followed by git pull .

4) If you had stashed(step 3) then you need to do git stash pop after git pull or else skip this step

5) After the above procedure, you may or may not get conflicts. If you do not get conflicts, then you are lucky enough. IF you do, then resolve the conflicts and then commit it

6) Now you can do git push

Answer 2

So, I ended up making a back-up. Then I ran

git pull

After doing

git push --set-upstream master origin

I am able to do push and commit without any problems!

Answer 3

You can add branch for just for your new code. So the code from master branch wont overwrite your code.

After you submit your branch you can see diff between branches.