I think opening PRs is the way to go. We're going to have maybe three
kinds of merges when we sync a feature branch with master.
- The *good* kind when there are no conflicts. Yay! Easy review, no
problems, quick +1.
- The *bad* kind when there are conflicts. This will take some
How are we going to keep Feature Branches up to date with master?
Do we need a PR? Is it just a behind the scenes commit from a committer?
Can a committer also optionally update master as part of landing another PR?
We are trailblazing here, so we can work with this to get an idea before we
