simplify branching model

This commit is contained in:
Patrick Kanzler 2020-05-08 23:48:48 +02:00
parent 4d106e8659
commit 32c56e78ea
1 changed files with 3 additions and 6 deletions

View File

@ -56,12 +56,9 @@ Apart from that the travis-log and the check by Landscape will provide you with
GIT GIT
^^^ ^^^
The master-branch contains code that has been released to PyPi. A release is marked with a tag The master-branch contains the main development of the project. A release to PyPi is marked with a tag
corresponding to the version. Issues are closed when they have been resolved in the development-branch. corresponding to the version. Issues are closed when they have been resolved by merging into the master-branch.
When you have a change to make, begin by creating a new branch from the HEAD of `python-escpos/master`.
When you have a change to make, begin by creating a new branch from the HEAD of `python-escpos/development`.
Name your branch to indicate what you are trying to achieve. Good branch names might
be `improve/text-handling`, `feature/enable-color-printing`.
Please try to group your commits into logical units. If you need to tidy up your branch, you can make use of a Please try to group your commits into logical units. If you need to tidy up your branch, you can make use of a
git feature called an 'interactive rebase' before making a pull request. A small, self-contained change-set is git feature called an 'interactive rebase' before making a pull request. A small, self-contained change-set is