My rule of thumb is basically: will someone else view (or specially be affected by) the change? Then use merge. Will not? Then use rebase. On a local branch? D

My rule of thumb is basically: will someone else view (or specially be affected by) the change? Then use merge. Will not? Then use rebase. On a local branch? Definitely rebase. On a branch from an active pr? Definitely merge. Most situations are not so straightforward (what about a pushed branch without a pr? And with a draft?) But in those case mostly depends on the team. If you know/think someone used/reviewed that branch, never rewrite history. Otherwise please do.