How to merge main to origin/main?

Asked Mar 18 '22 at 16:24

Active Mar 18 '22 at 16:36

Viewed 26 times

I had issues in my build and I did git reset hard to one of the older branches and now I am on that old branch but my origin/main is still on the new one. How can I merge my changes from main to origin/main ?

For example - origin/main is on commit b7e4f25 I did git reset --hard 9ad219d (This was the earlier commit before b7e4f25).

No local branch main is on 9ad219d and origin/main and origin/HEAD is on b7e4f25. I want to bring back origin/main and origin/HEAD to 9as219d.

edited Mar 18 '22 at 16:36

asked Mar 18 '22 at 16:24

Jainam Shah

You might not be asking how to do what you actually want to do. If you intended to do a hard reset, you can't `merge` that into `origin/main`, you would have to force push your changes. But I wouldn't do that unless you're sure that's what you want to do. – TTT Mar 18 '22 at 16:28
`origin/main` _is_ a branch. How can it be "on the new one"? Please revise to be more clear. – isherwood Mar 18 '22 at 16:28
I did the edit. – Jainam Shah Mar 18 '22 at 16:37
1

OK. In that case you must force push. You can't merge. – TTT Mar 18 '22 at 16:37
Can you suggest me how to do it please ? – Jainam Shah Mar 18 '22 at 16:40
@JainamShah you didn't know it because you were thinking about "merge", but this is a duplicate of another question which answers your question. – TTT Mar 18 '22 at 16:41
That worked that you so much – Jainam Shah Mar 18 '22 at 17:09

How to merge main to origin/main?

0 Answers0