We also use Stash and just enforce that PR descriptions should be the "clean" version of your combined commit messages. This way you: a) Never change pushed hi

We also use Stash and just enforce that PR descriptions should be the "clean" version of your combined commit messages. This way you: a) Never change pushed history b) Have the Pull Request act as a single source of what changed in each feature branch. Since Stash also includes comments from code review, we find it offers more context than straight commit history c) Don't have to worry about team commit-early-commit-often vs. team commit-only-when-it-works-perfectly. The changes will all be centrally documented in the PR, no matter the individual styles