> On Nov 16, 2026, at 3:10 PM, Ruediger Pluem via dev <[email protected]>
> 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
IMO, I'm not sure it really matters at this stage. I think we've all run into
situations which require, or are better suited for, both and forcing one tends
to muddy things up and does more harm than help. Both provide the sort of
(limited) provenance that is part and parcel of `git`.
--
Jim
"I've ordered not one, not two, but three crates of poppers.
We are havin' it large!"
Tony Harrison