On Wed, 19 Jan 2022, Ryan Joseph via fpc-pascal wrote:
On Jan 19, 2022, at 1:26 PM, Sven Barth <[email protected]> wrote:
We also take merge requests. If you have a fork anyway, then a merge request is
probably easier. Though you need to have your repository set up to use rebasing
instead of merging, see here: https://wiki.freepascal.org/FPC_git#Update
Sorry I'm not following. Before starting this branch I did a pull from the main branch so I'm up to date.
What other steps do I need to do? If I do a "git pull --rebase" on the feature
branch does that even do anything?
It's explained in the page that Sven referred to ?
It's only when you merge into your feature branch from the main branch that you
will see an effect.
Michael.
_______________________________________________
fpc-pascal maillist - [email protected]
https://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-pascal
