Skip to content

Commit

Permalink
Fix wording around remove merge commits in style guide
Browse files Browse the repository at this point in the history
  • Loading branch information
Mab879 committed Nov 16, 2023
1 parent 90c89bb commit a300203
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion docs/manual/developer/04_style_guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

* Should follow [the template](https://github.com/ComplianceAsCode/content/blob/master/.github/pull_request_template.md)
* Shall remove the sample text from the template pull request
* Shall not have merge commits; they should have to be taken out by [rebasing](https://docs.github.com/en/get-started/using-git/about-git-rebase)
* Shall not have merge commits; they should have been taken out by [rebasing](https://docs.github.com/en/get-started/using-git/about-git-rebase)
* Should target `master` unless pulling an already merged pull request to a stabilization branch
* Shall have a useful title so that it can used in the changelog

Expand Down

0 comments on commit a300203

Please sign in to comment.