From 93c3b26909b8900f6f0c9659ceb269d15810e630 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Ku=C3=9Fowski?= Date: Wed, 1 Oct 2025 12:47:28 +0200 Subject: [PATCH] chore: Mention rebases --- CONTRIBUTING.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a39035a56..f54a0fb85 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -7,9 +7,10 @@ To improve the process please make sure that you read the following guidelines c 1. Always create a Pull Request for any changes. 2. Whenever possible please make sure that your Pull Request only contains **one** commit. Cases where multiple commits make sense are very rare. -3. Every Pull Request should change only one thing. For bigger changes it is often better to split them up in multiple Pull Requests. -4. [Sign your commits](https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits). -5. Format the commit message as [Conventional Commits](https://www.conventionalcommits.org). -6. Format (`flutter format lib`) and sort impots (`dart run import_sorter:main --no-comments`) in all code files. -7. For bigger or complex changes (more than a couple of code lines) write an issue or refer to an existing issue and ask for approval from the maintainers (@krille-chan) **before** starting to implement it. This way you reduce the risk that your Pull Request get's declined. -8. Prefer simple and easy to maintain solutions over complexity and fancy ones. \ No newline at end of file +3. Do not add merge commits. Use rebases. +4. Every Pull Request should change only one thing. For bigger changes it is often better to split them up in multiple Pull Requests. +5. [Sign your commits](https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits). +6. Format the commit message as [Conventional Commits](https://www.conventionalcommits.org). +7. Format (`flutter format lib`) and sort impots (`dart run import_sorter:main --no-comments`) in all code files. +8. For bigger or complex changes (more than a couple of code lines) write an issue or refer to an existing issue and ask for approval from the maintainers (@krille-chan) **before** starting to implement it. This way you reduce the risk that your Pull Request get's declined. +9. Prefer simple and easy to maintain solutions over complexity and fancy ones. \ No newline at end of file