Private GIT

Skip to content
Snippets Groups Projects
Commit 40724060 authored by jonathanendersby's avatar jonathanendersby
Browse files

Adding a new step to make sure that develop is up to date.

My develop was stale (pre-mako) and I followed the steps listed, after a few minutes of development I realised that my feature branch (based off develop) still have tmpl files, and no mako files.  This step might be obvious for non-noobs, but I figure it makes sense to be explicit.
parent 0cf1ab41
No related branches found
No related tags found
No related merge requests found
......@@ -103,6 +103,15 @@ Please follow this process; it's the best way to get your work included in the p
git merge upstream/master
```
- Make sure that your develop branch is up to date:
```bash
# Switch to the develop branch
git checkout develop
# Pull down any updates
git pull
```
- Create a new topic branch to contain your feature, change, or fix:
```bash
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment