FANDOM


Using gitflow workflow: https://www.atlassian.com/git/workflows#!workflow-gitflow

Git-workflow-gitflow

Navigation develop branch is navigation-dev.

--- master
   |--- navigation-dev
       |--- navigation-presets
       |--- navigation-history
       |--- navigation-gizmo
       |--- navigation-...

New feature branches called navigation-*

Get new dev snapshot

# get a new snapshot
git clone git@github.com:hpicgs/cgsee.git
cd cgsee
git checkout navigation-dev
git pull

Create new feature branch (use dev as base!)

# from navigation-dev
git checkout -b navigation-feature

Merge feature branch back in dev

git checkout navigation-dev
git fetch -a
git pull
git merge navigation-feature