Github Desktop - How to keep track on code history of local, remote repo created separately?

Question

I want to keep track on 2 repo with the SAME NAME created SEPARATELY. 1 is in local machine and 1 is in remote.

But whenever I pressed "publish repository" after "commit to production", there was a red warning saying that "Repository creation failed. (name already exists on this account)".

So my question is, is there any way for me to keep track on the code history of these 2 repo?

Thank you.

Answer 1

I'm going to assume that when you say "repo" you mean "branch" (a big stretch, I know), and that the situation is something like this: GitHub has this:

A -- B -- C (mybranch)

But you on your local machine have this:

X -- Y -- Z (mybranch)

And I take it that what you want is this, on both:

A -- B -- C -- X -- Y -- Z (mybranch)

The way to obtain that is as follows:

git fetch
git switch mybranch
git rebase --keep-empty origin/mybranch
git push origin mybranch

You will observe that I have not limited myself to the restriction that this should be done using GitHub Desktop alone. I don't know whether it has the power to do this (and I don't really care).