| ... | ... | @@ -20,7 +20,7 @@ which are different versions of the same project that can be `merged` into each |
|
|
|
In Boardcore there are two main branches:
|
|
|
|
|
|
|
|
- The `master` branch: is the main branch, everything's that here has been tested and it's working (or at least it should).
|
|
|
|
- The `development` branch: is where development takes places. When a new feature is ready, it has to work with
|
|
|
|
- The `testing` branch: is where development takes places. When a new feature is ready, it has to work with
|
|
|
|
the rest of the code and then, only when everything's working, it can be merged with the master.
|
|
|
|
|
|
|
|
------------------
|
| ... | ... | @@ -39,12 +39,12 @@ If you want to see a nice branching model example take a look at <http://nvie.co |
|
|
|
### Boardcore Workflow
|
|
|
|
|
|
|
|
- A new feature is required (e.g. a barometer driver)
|
|
|
|
- A new branch called `barometer` or `barometer-dev` is created from `development` (you can do it locally)
|
|
|
|
- A new branch called `barometer` or `barometer-dev` is created from `testing` (you can do it locally)
|
|
|
|
- Commits are made on the branch
|
|
|
|
- Frequently `rebase` (merge from development new changes that have been done there)
|
|
|
|
- When it's ready, make sure it's 0 commits behind the master and *TEST* it one last time.
|
|
|
|
- A `pull request` is made to merge the branch back into the development branch
|
|
|
|
- In `development` futher integration tests occur, and then everything is merged on the master
|
|
|
|
- In `testing` futher integration tests occur, and then everything is merged on the master
|
|
|
|
|
|
|
|
### Commits
|
|
|
|
Commits are the core of your team work, because they are the way in which you change the code.
|
| ... | ... | |
