On 2026-11-16 4:10 p.m., Ruediger Pluem via dev wrote:
Do we have any preferred merging approach (squash and merge vs rebase and
merge) for PRs
and if yes is it the same for trunk PRs and 2.4.x PRs?
Regards
RĂ¼diger
I hope I can make a related comment/suggestion, to the project
maintainers: now that we're on GitHub, I would strongly recommend that
we use a GitHub action, to manage what PR's should be backported (this
has been a lifeline for us in MapServer, see the action YML at
https://github.com/MapServer/MapServer/blob/main/.github/workflows/backport.yml
).
This means that, before merging a PR, one of the project maintainers
simply adds a label to that PR, such as "branch-2.4.x"), and then when
someone merges that ticket, a new PR is automagically opened to the
"2.4.x" branch, containing those changes.
(sorry for the use of "we", it sounds better than "you" here)
-jeff