There isn't anything to compare. Nothing to compare, branches are entirely different commit histories

后端 未结 18 917
北恋
北恋 2020-12-12 22:54

I have a CMS theme installed on my machine. I\'m tracking changes to it via git and decided to back it up on GitHub so I could share those changes.

The theme as prov

18条回答
  •  没有蜡笔的小新
    2020-12-12 23:10

    I had an issue where I was pushing to my remote repo from a local repo that didn't match up with history of remote. This is what worked for me.

    I cloned my repo locally so I knew I was working with fresh copy of repo:

    git clone Your_REPO_URL_HERE.git
    

    Switch to the branch you are trying to get into the remote:

    git checkout Your_BRANCH_NAME_HERE
    

    Add the remote of the original:

    git remote add upstream Your_REMOTE_REPO_URL_HERE.git
    

    Do a git fetch and git pull:

    git fetch --all
    
    git pull upstream Your_BRANCH_NAME_HERE
    

    If you have merge conflicts, resolve them with

    git mergetool kdiff3 
    

    or other merge tool of your choice.

    Once conflicts are resolved and saved. Commit and push changes.

    Now go to the gitub.com repo of the original and attempt to create a pull request. You should have option to create pull request and not see the "Nothing to compare, branches are entirely different commit histories" Note: You may need to choose compare across forks for your pull request.

提交回复
热议问题