I found that this makes rebasing a feature branch really difficult. The alternative is not much better.