From 4de7dbf3a23715e6be5daa65fba097d1f5b28e71 Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Sun, 21 Jul 2024 20:40:43 +0300 Subject: [PATCH] Update CONTRIBUTING.md --- CONTRIBUTING.md | 5 +++++ 1 file changed, 5 insertions(+) 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.