I would take that one step further and never rebase any branch ever.