Skip to content

Commit

Permalink
Update developer guidelines: one feature == one branch (StoglRobotics…
Browse files Browse the repository at this point in the history
…#102)

Co-authored-by: Robotgir <[email protected]>
  • Loading branch information
destogl and Robotgir authored Jan 31, 2023
1 parent 4935798 commit 267026c
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion docs/guidelines/development.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 267026c

Please sign in to comment.