From 6c37f51c3766a4196d808e44506f4f0abd5f7bc6 Mon Sep 17 00:00:00 2001 From: Gabriel Luiz Freitas Almeida Date: Sat, 22 Jun 2024 19:13:33 -0300 Subject: [PATCH] docs(contributing.md): update contribution guidelines --- CONTRIBUTING.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 383d21344..3fa42aa8e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -7,6 +7,19 @@ to contributions, whether it be in the form of a new feature, improved infra, or To contribute to this project, please follow a ["fork and pull request"](https://docs.github.com/en/get-started/quickstart/contributing-to-projects) workflow. Please do not try to push directly to this repo unless you are a maintainer. +## Linear History + +We strive to maintain a linear history in our git repository. This means that we do not accept merge commits in pull requests. To achieve this, we ask that you rebase your branch on top of the `dev` branch before opening a pull request. This can be done by running the following commands: + +```bash +git checkout dev +git pull +git checkout +git rebase dev +# Fix any conflicts that arise +git push --force-with-lease +``` + The branch structure is as follows: - `main`: The stable version of Langflow