Git-Workflow.md

@@ -30,19 +30,30 @@ the rest of the code and then, only when everything's working, it can be merged
 
 To make changes to the software you should use:
 
-- `feature` branches: are branched off from `development` and exist for a limited amount of time for developing a specific feature. 
+- `development` branches: are branched off from `testing` and exist for a limited amount of time for developing a specific feature. 
 - `hotfix` branches: when a bug is found on the master, a branch is created to find a fix to that bug.
-When the problem is solved, the branch will be merged with the master *and* the development branch before being cancelled.
+When the problem is solved, the branch will be merged with the master *and* the testing branch before being cancelled.
 
 If you want to see a nice branching model example take a look at <http://nvie.com/posts/a-successful-git-branching-model/>.
 
 ### Boardcore Workflow
 
 - A new feature is required (e.g. a barometer driver)
-- A new branch called `barometer` or `barometer-dev` is created from `testing` (you can do it locally)
+- A new branch called `barometer-dev` is created from `testing` (you can do it locally)
+
+```
+git pull
+git checkout -b barometer-dev
+```
+
 - 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.
+```
+git status
+git add name-of-modified-file
+git commit -m "[BAROMETER] Added barometer driver."
+```
+- Frequently `git pull` and `git merge testing` to keep aligned to the testing branch.
+- When it's ready, make sure it's 0 commits behind testing and *TEST* it one last time.
 - A `pull request` is made to merge the branch back into the development branch
 - In `testing` futher integration tests occur, and then everything is merged on the master