Git Workflows

Branching Strategies

Long Running Branches



Example: Master <- Develop

Using this strategy, you would merge the development branch into master when you want to activate the new features.

Example: Long Running Diagram

Long Running Branches

Example: Long Running Code

$ git checkout master
$ git status

On branch master
Your branch is up-to-date with 'origin/master'.

$ git branch develop
$ git checkout develop
$ git add files_that_changed
$ git commit -m "My awesome changes"
$ git checkout master
$ git pull
$ git merge develop
$ git push origin/master

Feature Branches



Master <- Feature

Example: Feature Branch Diagram

Topic Branches with Merge

Example: Feature Branches Many

Topic Branches Many

Continuous Delivery

 Previous Lesson Next Lesson