Resetting GitLab Fork

[Robert Lancaster]

Hey guys,

I made some changes in my fork yesterday to support load and slew.  I committed the changes, sent them to GitLab and sent Jasem a merge request.  He found a more efficient way to write my method, so he did incorporate my changes, but he did it a little differently than in my merge request.  So now I need to update my fork to match master again with his changes not mine. I found a couple of different ways to do it online, and I was able to fix my local copy and update it to the upstream master, but most of them say to do the command "git push origin master —force” at the end to send my changes to the fork on GitLab, but this didn’t work, it rejected it. The other day I had a very similar problem, so I finally ended up deleting my fork and making a new one, but I think there should be a way to do it without having to go that far.  Does anyone know how to do this?

Thanks,

Rob
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kstars-devel/attachments/20201013/42cca9fd/attachment.htm>