Home / Questions / 210678
Accepted
Alejandro Estupiñán
Asked: 2020-11-05 14:59:06 +0800 CST 2020-11-05 14:59:06 +0800 CST

Github refusing to merge unrelated histories

  • 772

Can you leave me the steps to connect to my remote repository on github and update all the code that is in that repository, thanks

$ git remote add origin github.com/alexhak1/ThinkSecWEB
fatal: remote origin already exists

$ git push master
fatal: 'master' does not appear to be a git repository 
fatal: Could not read from remote repository. Please make sure you have the correct access rights and the repository exists
github

5 Answers

  1. Best Answer

    What is usually done is to clone the repo

    git clone [email protected]:alexhak1/ThinkSecWEB.git

    Whereby the folder is created ThinkSecWEBand the remote is immediately configured origin.

    It gives me the idea that you did

       git init
   git remote add origin [email protected]:alexhak1/ThinkSecWEB.git

    This done, you started creating files and folders.

    Either of the two flows will lead to repeating the second instruction giving you an error because originit already exists .

    The command

    git push master

    It will always give an error, because the syntax should be

    git push origin master

    Which means "merge my local master into the remote origin/master branch".

    Given the error message in your question, I assume that at some point you put (for example):

    git add --all
git commit -am "primer commit local"

    And then

    git pull

    either

    git push

    either

    git push --set-upstream origin master

    But your remote has a commit that your local doesn't, and vice versa. There is no common ancestor and therefore cannot be merged.

    If the remote code is slightly similar to your local code and you do want to do a merge, the solution would be:

    git fetch --all
git reset --soft origin/master
git add --all
git commit -am "comit encima del primer commit remoto"
git push origin master

    If the codes really have nothing to do with it, you can do:

    git push -f --set-upstream origin master

    And with that you are going to forcefully step on the remote with your local commits. Beware that with this you will lose what is in the remote.

    • 8

  2. When the git bash tells us: Github refusing to merge unrelated histories (Github rejects joining unrelated histories) as the question says, the Solution that I have applied, and it has worked for me is

    $git push origin master --allow-unrelated-histories

    Now if what you want is to merge:

    $git merge origin master --allow-unrelated-histories

    In this way, it is guaranteed that unrelated or unrelated histories (unrelated-histories) can be connected to the repository.

    • 4

  3. As I see your problem is that you are not specifying the `upstream' where to send the changes.

    $ git push origin master

    Now according to the error in the description it is likely that the history differs so you can force the push

    $ git push origin master --force

    Although the best thing would be to do a 3way merge and then upload the changes

    $ git pull origin master
$ git push origin master
    • 1

  4. Another solution is:

    git pull --allow-unrelated-histories

    and then

    git push
    • 1

  5. It happens that when you want to add a remote repository to your local repository, the two repositories have different histories and that is why it does not allow merging and so that both can merge, use this command:

    git pull origin main --allow-unrelated-histories
    • 0