Skip to content

Commit

Permalink
fix: change working to remove that merge commits produce unclean git …
Browse files Browse the repository at this point in the history
…history
  • Loading branch information
SudharakaP committed Jun 21, 2021
1 parent 00aa770 commit 72f2bb7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion rfcs/012-merge-rebase-strategy.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ 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)
as it's probably not suitable for use. Using that option will create merge commits and will prevent a clean 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. 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
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
Expand Down

0 comments on commit 72f2bb7

Please sign in to comment.