Our master branch has a branch protection rule that requires all commits to be submitted via an approved pull request. Therefore to squash to more than 1 commit I must either:
Force-push to the old PR. That's not ideal, because it makes the development history less obvious.
Make a new PR
This PR is option 2. It's required because I couldn't push these squashed commits straight to master (even though the other PR has the required number of approvals and the end state is the same).
Note: Please let me merge this - it should be merged without further squashing.
This PR has the same end state as #6, but I squashed it into atomic commits and wrote some commit messages.
See these links:
Our
masterbranch has a branch protection rule that requires all commits to be submitted via an approved pull request. Therefore to squash to more than 1 commit I must either:This PR is option 2. It's required because I couldn't push these squashed commits straight to
master(even though the other PR has the required number of approvals and the end state is the same).Note: Please let me merge this - it should be merged without further squashing.