Branching flow

Flow

To make code review easier, we will try to use a two-branch flow. We start with a development branch, e.g., wip/something. Once the code is ready for PR/review, a new branch feature/something is created, and wip/something is merged to it. The PR will be filed with feature/something.

Subsequent development and trivial commits happen in wip/something. Once the code is ready for review, wip/something is merged to feature/something again.

The merge from wip/something to feature/something may be a squash, or the merge should contain sufficient checkin log, unlike a normal merge. I guess squash might work better, but am not totally certain. wip/something may force-push, but feature/something should not.

Note

Github offers "convert to draft" feature for each pull requests, but it is not useful if we want to exclude trivial commits without force-push to the same pull request.