@b0rk It's quite easy to mess up conflict resolution during rebasing in my experience, I've often made mistakes where I was rebasing a branch a couple weeks later and managed to either lose some of my changes or undo something done in the main branch. Doing a merge _sometimes_ is better in these situations, since all conflicts are presented upfront rather than per-commit so the context is easier to identify.