|
|
@@ -416,8 +416,8 @@ and atomic.
|
|
|
|
|
|
Do not merge something you wrote yourself. Do not merge a PR you reviewed alone,
|
|
|
instead, merge PRs that have already be reviewed and approved by another reviewer.
|
|
|
-If there is only one commit in the PR, prefer the squash feature, otherwise, always
|
|
|
-use a regular merge.
|
|
|
+If the commit history is unclear or irrelevant, prefer the "Squash and merge" feature, otherwise, always
|
|
|
+use the "Rebase and merge" feature.
|
|
|
And finally, use your common sense : if you see a PR about a typo,
|
|
|
or if there is a situation (faulty commit, revert needed) maybe you can merge it directly.
|
|
|
|
Sonata CI