From fa37922ca76b749ce046f1ce1f15f7e1322c9244 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ni=C3=B1o=20D=C3=ADaz?= Date: Sun, 5 May 2019 23:38:26 +0100 Subject: [PATCH] Remove develop branch from contributing guide MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This branch was meant to contain changes that were considered too risky to be in master. However, there is not enough activity in the repository to justify its presence. Both branches are always pointing at the same commit. Signed-off-by: Antonio Niño Díaz --- CONTRIBUTING.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 32270435..9d18fcb8 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -65,9 +65,9 @@ copyright and the reference to the MIT License. 1. Fork this repository. -2. Checkout the ``develop`` branch. +2. Checkout the ``master`` branch. -3. Create a new branch to work on. You could still work on ``develop``, but it's +3. Create a new branch to work on. You could still work on ``master``, but it's easier that way. 4. Compile your changes with ``make develop`` instead of just ``make``. This @@ -90,7 +90,7 @@ copyright and the reference to the MIT License. long as you specify it when executing the command: ``CHECKPATCH=../path/to/folder make checkpatch``. -8. Create a pull request against the branch ``develop``. +8. Create a pull request against the branch ``master``. 9. Be prepared to get some comments about your code and to modify it. Tip: Use - ``git rebase -i origin/develop`` to modify chains of commits. + ``git rebase -i origin/master`` to modify chains of commits.