Skip to content

Commit

Permalink
fix wording of the RFC for make sure it sounds definite
Browse files Browse the repository at this point in the history
  • Loading branch information
SudharakaP committed Jun 25, 2021
1 parent 90f0610 commit 811bb09
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions rfcs/012-merge-rebase-strategy.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,9 @@ Although this seems to work in most cases it's probably a good practice to see i
## Solution

[Disable `Create a merge commit` from the GitHub settings](https://docs.github.com/en/github/administering-a-repository/configuring-pull-request-merges/configuring-commit-squashing-for-pull-requests)
to help maintain a linear Git history. Additionally, suggest also disabling `Rebase and merge` as well although it could be argued to leave it in case someone would like to explicitly include
to help maintain a linear Git history. But keep the `Rebase and merge` option in case someone would like to explicitly include
several commits to the `main` branch. The squash and merge option should work for us in all cases.

As an alternative or a stricter enforcement of this standard we can also add the [`Require linear history` branch protection rule
to `main` branch](https://docs.github.com/en/github/administering-a-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule).
Also add the [`Require linear history` branch protection rule
to `main` branch](https://docs.github.com/en/github/administering-a-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule) to
avoid merge comments being written to the main branch.

0 comments on commit 811bb09

Please sign in to comment.