Resetting GitLab Fork
Eric Dejouhanet
eric.dejouhanet at gmail.com
Wed Oct 14 22:16:50 BST 2020
Hello Robert,
We're closer to the github methodology with gitlab.
If you are using your local and fork main branches for development, you
can simply reset your local main to the upstream main once your MR is
merged (the remote you created your fork from).
But you will have to force-push to the main branch of your fork to
create another MR like this.
If you are using a development branch, and are pushing to your fork main
branch to create your MR, you can simply forget your local development
branch and restart a new branch from the upstream main.
But you will have to force-push to the main branch of your fork to
create another MR like this.
The best is to maintain your local main branch by pulling changes from
the upstream main branch as often as possible, and never use your fork
main branch (which, incidentally, you can delete in the UI).
Checkout your local development branch from your local main initially
and merge changes over your work from your local main when needed. Then
push your local development branch to your fork as is, and create the MR
from it.
Any additional commit you push to your fork development branch will get
added
--
-Eric
mailto:eric.dejouhanet at gmail.com -- https://astronomy.dejouha.net
More information about the Kstars-devel
mailing list