From 267026cd1f2af0c72991b052d60ed696230e3e87 Mon Sep 17 00:00:00 2001 From: "Dr. Denis" Date: Tue, 31 Jan 2023 15:20:40 +0100 Subject: [PATCH] Update developer guidelines: one feature == one branch (#102) Co-authored-by: Robotgir <47585672+Robotgir@users.noreply.github.com> --- docs/guidelines/development.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/guidelines/development.rst b/docs/guidelines/development.rst index 0721fc1d..efdea7bb 100644 --- a/docs/guidelines/development.rst +++ b/docs/guidelines/development.rst @@ -35,7 +35,8 @@ This section describes in short process with valuable tips to make your and revi Take into account that master branch of your fork is usually not up to date with the upstream repository. Therefore be careful about that and use the opportunity to sync *master* branch of the fork to the state of the *master* branch of the upstream repository. -#. **Always** create a new branch for each feature or bug fix. Don't submit PRs from *master* branch. +#. **Always** create a new branch for each feature or bug fix. + **Never** make multiple changes on a same feature branch. One feature / change == one branch. Don't submit PRs from *master* branch. #. **Before** starting development check how the branch will be merged, using *merge commit* or *squash* method. If *merge commit* is used make sure that each of your commits is clean and named properly since they will become part of the repository's history.