On Wed, 19 Jan 2022, Ryan Joseph via fpc-pascal wrote:
On Jan 19, 2022, at 4:19 PM, Ryan Joseph <generic...@gmail.com> wrote:
Still not following this. Do you need me to do a pull-rebase from main and then
make my pull request?
I used git at work everyday but I'm still a newbie in many ways. Reading this
now but I'm confused because it seems too late. Please provide exact steps. :)
Make sure your fork gets all changes from upstream by mirroring it regularly:
https://docs.gitlab.com/ee/user/project/repository/mirror/index.html
or
https://about.gitlab.com/blog/2016/12/01/how-to-keep-your-fork-up-to-date-with-its-origin/
In your local copy, execute:
git config pull.rebase true
Update your main branch:
git switch main
git pull
Now rebase your feature branch:
git switch yourfeaturebranch
git rebase main
That should be it (if there are no conflicts, which unfortunately can happen)
Michael.
_______________________________________________
fpc-pascal maillist - fpc-pascal@lists.freepascal.org
https://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-pascal
