Can't GitLab import a Github repo into a new GitLab repo? Essentially forking it?
Yeah, that's easy with git:
git checkout -b new_feature
.. do some stuff ..
git commit
... upstream changes some stuff ...
git checkout main
git fetch --all
git merge upstream/main
git checkout new_feature
git rebase main
(Assuming you have a remote called upstream set up pointing to the actual upstream git repo.)
I have a Certbot fork with a few added features and I rebase main often enough.. When changes have been made to the code which was also modified by yourself, you'd get a conflict you'd need to resolve before continuing with the rebase, but that's often easy enough, especially with this easy patch.