I agree with Yann and Joe. Both options should remain available.
Squash for small changes, rebase when the commit history matters.For 2.4.x, the important thing is to keep references to the original trunk commits.
I don't think we need a strict rule. Regards, On 11/16/26 9:10 PM, 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
-- Arturo
