Review Merge Process

Before a PR can be merged:

• Reviewers must include every affected component owner.
  • A reviewer may add an additional reviewer.
  • 3rd-party files require review from validation, which should occur before the PR is submitted.
• All reviewers must approve the PR.
  • A component owner may remove a reviewer if they deem there is already sufficient review.
• The merger should perform an additional review, checking for:
  • Unintended files, such as files missing from .gitignore
  • 3rd-party files.
    • These require pre-approval from validation.

Merge process (a.k.a. the 🐸 process):

• The oldest mergeable PR is merged.
  • Use the squash merge option on the merge button
    • Comments may be edited if needed.
  • Exceptions (out of order merges, see below) may be made to deal with specific circumstances.
• The PR branch is deleted.
• Update the oldest fully-approved PR that CI has passed on to begin CI checking for the next merge.

One component owner is designated 🐸 during normal weekday US west-coast hours and

• Monitors PRs,
• Pings reviewers to review.
• Pings submitters to address merge conflicts and review comments.
• Announces and coordinates out-of-order merges.
  • Any component owner may move the merge process along if an out-of-order PR is not in the works.

Tips:

• You can set the filter on the Github Pulls requests page to is:open status:success review:approved to see a narrowed down list of merge candidates that are (mostly) ready to go.