GIT：如何将第二个本地存储库与现有的GitHub存储库连接？

Question

I am learning to handle the GIT repositories. I have a repository on GitHub and I have cloned it locally. I have modified some files, then add -A, commit -m and git push origin master. So far so good.

Now, I have created another local repository with Git GUI, I have placed the files of the site-web (django 2.0), and again add, commit, after:

$ git remote add origin https://github.com/Frank-Mascarell/LibrosWeb.git
$ git remote -v
origin  https://github.com/Frank-Mascarell/LibrosWeb.git (fetch)
origin  https://github.com/Frank-Mascarell/LibrosWeb.git (push)
$ git status
On branch master
nothing to commit, working tree clean
$ git fetch origin


$ git push origin master
To https://github.com/Frank-Mascarell/LibrosWeb.git
! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'https://github.com/Frank-
Mascarell/LibrosWeb.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.

and I have also tried:

$ git pull origin master
From https://github.com/Frank-Mascarell/LibrosWeb
* branch            master     -> FETCH_HEAD
fatal: refusing to merge unrelated histories

Why are you giving these errors? It seems that the two repositories are not well connected, and I can not upload or download.

Answer 1

If I understand correctly, you have created a new repository from scratch, and you have added a remote to that.

In the first scenario, you are trying to push changes to a branch which does not share the same history as your branch.

In the second scenario, you are trying to merge changes from the remote branch into your branch. This fails because the two branches do not share any common history.

If you instead start over and instead of initialising a new repository, make sure you clone the original one and start from there. This will allow you to both push new changes, and to merge or rebase on top of existing commits.

Answer 2

The error message gives a clue as to the issue. The two repositories have unrelated histories.

In git, you aren't solely dealing with files and changes to files, though that is what you are getting out of it. Each commit in git contains a reference to every commit that lead up to it, giving you a full and complete history of how things got to be the way they are.

What happened is you have three repositories, two are linked, and one was created brand new but given identical files.

So your repository started on github, and then was cloned down locally, and you can push and pull back and forth, mirroring not just the data but the entire commit history. They both have a complete reference of your project from start to finish.

The new repository just has a snapshot of the most recent state of the project, without any history.

It's possible to modify your new local repository to get it into a state where it can push to an existing branch again, but it's probably more complicated than necessary.

The easiest thing to do is just to clone the new repository again, either from github or from your first local repository.

However, if you have changes you've already made to the second local repository, you'll want to copy those changes into one of your cloned repositories, make new commit(s) and push from there.