The thing is, you can get your cake and eat it too. Rebase your feature branches while in development and then merge them to the main branch when they're done.