Rebase and merge with merge commit. But that's also assuming the individual commits are worth saving. If they're a mess, then squashing them is better. But if they're interesting and useful to be separate, I like to keep them separate. But I also like the merge commit because it includes the PR in the commit chain, which I find helpful for tracing context as to which PR brought in certain commits.
Rebase and merge with merge commit. But that's also assuming the individual commits are worth saving. If they're a mess, then squashing them is better. But if they're interesting and useful to be separate, I like to keep them separate. But I also like the merge commit because it includes the PR in the commit chain, which I find helpful for tracing context as to which PR brought in certain commits.