diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e935f9d12..0da1851df 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -16,6 +16,11 @@ Fork the repository and open a pull request to submit your work. Please consider
 * Running `cargo fmt` and `cargo clippy` to keep the code formatting in check.
 * Running `make` to run the test suite.
 
+As general guideline for pull requests, please:
+
+* Don't mix fixes and cleanups in same pull request. They just increase the likelhood of merge conflicts. Cleanups are welcome, but just keep them separate.
+* Prefer `git rebase main` over `git merge main` on your branches to keep git logs clean.
+
 ## Debugging query execution
 
 Limbo aims towards SQLite compatibility. If you find a query that has different behavior than SQLite, the first step is to check what the generated bytecode looks like.