Hi everyone,

I need a little bit of help.  I made a mistake and accidentally pushed on my local main branch.  I'm trying to revert it so I can resynchronise it with FPC's main branch, but it's not letting me. Do you know what I have to do?

Gareth aka. Kit

Just to clarify, I cannot delete the branch because it's the default branch, and it won't update with the mirror because it's diverged, and I can't revert the accidental commit on Gitlab because it just adds a new commit saying the last one is reverted, and is still marked as diverged.

Gareth aka. Kit

J. Gareth Moreton wrote

Just to clarify, I cannot delete the branch because it's the default branch, and it won't update with the mirror because it's diverged, and I can't revert the accidental commit on Gitlab because it just adds a new commit saying the last one is reverted, and is still marked as diverged.

1) git reset --hard <hash of the top commit from fpc main>
2) verify with git log that you no longer have any unwanted commits
3) git push --force origin HEAD

Jonas

Thanks Jonas,

I got main working again by changing the mirror to a force pull, since that branch is meant to be protected anyway.  I've also learnt about force pushes which is helping with the rebases too! I'm now trying to clean up my merge requests.

Gareth aka. Kit