Rebase, except for situations where a branch has multiple commits and the state of the branch isn't complete until all of them are merged, in that case you prob

Rebase, except for situations where a branch has multiple commits and the state of the branch isn't complete until all of them are merged, in that case you probably want merge. For example porting from GTK 2 to GTK 4, probably use multiple commits for each API being ported, then merge the branch at the end.