<mattip>
ronan: I personally prefer rebase, it makes the history nicer when eventually submitting a PR
<Hodgestar>
I find rebase extremely annoying if I'm trying to review incremental PRs because it completely break any published history, but if no one else is really looking at the commits, then it can be tidier in the end.