[geos-devel] Default merge strategy on Gitea

[Sandro Santilli]

I've changed the default merge strategy for pull requests
on Gitea to "Rebase and Merge (no-ff)". This means a merge
commit *will* be generated even if not necessary (after rebase).

Hopefully this will help not missing the information about *who*
actually merged the contribution, taking the responsibility over
the merge.

Other merge strategies are still available, just the default changed.
It doesn't make sense to force a merge commit for your OWN
contributions, for example.

In order to do the same from other sources please use the --no-ff
switch to the git-merge command (and possibly rebase the contributed
branch against current target branch before merging, to keep history
clean).


--strk;

  Libre GIS consultant/developer
  https://strk.kbt.io/services.html