Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Branch policies and strategy #18

Open
yizha1 opened this issue Mar 22, 2023 · 0 comments
Open

Branch policies and strategy #18

yizha1 opened this issue Mar 22, 2023 · 0 comments
Assignees
Labels
Governance issues to improve governance posture

Comments

@yizha1
Copy link
Contributor

yizha1 commented Mar 22, 2023

We have adopted branch policies recently for sub projects, see one of the issues notaryproject/notation#519.

This issue is for formally document the branch policies and strategy, like:

Manage main branch

  • Keep a high quality, up-to-date main branch.

Manage features

  • Use feature branches to develop new features, and naming convention
  • How to merge feature branches into the main branch using pull requests.

Manage releases

  • Use release branches to coordinate and stabilize changes in a release
  • Lifecycle management of release branch, for example, lock release branches when we are ready to stop supporting a particular release.

Manage bugs fixes

  • Use branches for bug fixes if need?

Define the rules for each branch. Rules could be different in some cases for different branches. Here are the rules we already applied for some repos.

  • Require PR before merging
  • Require number of approvals before merging, the current number for most sub projects is 3 approvals.
  • Dismiss stale PR approvals when new commits are pushed
  • Require review from Code Owners
  • Require status checks to pass before merging
  • Require conversation resolution before merging
  • Require signed commits
  • Do not allow bypass the above settings
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Governance issues to improve governance posture
Projects
Status: Todo
Development

No branches or pull requests

1 participant