I just rebase my feature branches before merging. Keeps the tree more or less linear.