[fpc-devel] Need help!

[J. Gareth Moreton]

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

On 30/10/2021 21:43, Jonas Maebe via fpc-devel wrote:
> On 30/10/2021 22:26, J. Gareth Moreton via fpc-devel 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
> _______________________________________________
> fpc-devel maillist  -  fpc-devel at lists.freepascal.org
> https://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-devel
>

-- 
This email has been checked for viruses by Avast antivirus software.
https://www.avast.com/antivirus