Git Flow Branching Model

Quick steps for using branching models as laid out in [1].

Some repositories, such as <redacted>-module, contain support branches for longterm maintenance of legacy code/systems. (ex: support-1.x)

Development automation via invoke using standard task library[2].

Merge Updates into Current Branch

From a content prespective, rebasing is changing the base of your branch from one commit to another making it appear as if you’d created your branch from a different commit.

The primary reason for rebasing is to maintain a linear project history.

See [3].

$ git rebase

References

  1. A Successful Git Branching Model

  2. Invoke Task Library

  3. git rebase

  4. PDF Version of main figure

  5. Git-flow Cheatsheet

../../_images/git-model.png