Branches

Git branch model

- develop

- feature

- release

- master

Some basic rules for successful development using branches:

- master only gets updated from release

- develop is the main working branch

- develop is the source for new releases and features

- features can only go back into develop

resource: https://nvie.com/posts/a-successful-git-branching-model/

1. create a new development branch from master

git branch develop
git push --set-upstream origin develop

2. develop code

2.1 set up develop environment

When developing code for a website, it may be wise to clone 'develop' into a new folder so as not to mess with the live/production 'master' environment

git clone git@gitserver:myproject myproj_dev
cd myproj_dev
git checkout develop

2.1 commit code

git add .
git commit -m <commit message>

2.2 upload commit to server

git push