Rebasing / rerolling is completely fine if done right, no need to be overly zealous. But merges are often more elegant