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

Question

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

Answer 1

I had mine solved by overriding the branch:

My case: I wanted to override whatever code is in the develop with version_2.

1. delete the local copy of conflicting branch:

git checkout version_2
git branch -D develop

2. checkout a fresh branch from the version_2 and force push to git:

git checkout -b `develop`
git push origin `develop`

I didn't need to rebase. But in my case, I didn't need to take code from my old code.