Upgrade to Pro — share decks privately, control downloads, hide ads and more …

Git: elevate your workflow

Avatar for harrisfz harrisfz
February 02, 2018

Git: elevate your workflow

SISI Sharing session 2 February 2018

Avatar for harrisfz

harrisfz

February 02, 2018

Other Decks in Programming

Transcript

  1. History • Linux World • (1991–2002) – No source code

    management to handle linux kernel maintenance • 2002 – Bitkeeper • 2005 – Bitkeeper -> Free • System needed: • Speed • Simple Design • Fully support non-linear development (Thousands parallel branch) • Fully distributed • Capable to handle big project -> linux kernel • Git
  2. GitFlow • is a branching model for Git • created

    by Vincent Driessen. • http://nvie.com/posts/a-successful-git-branching-model/
  3. The main branches The central repo holds two main branches

    with an infinite lifetime: • master • develop
  4. Supporting branches The different types of branches we may use

    are: • Feature branches • Release branches • Hotfix branches
  5. Supporting branches • aid parallel development between team members •

    ease tracking of features • prepare for production releases • assist in quickly fixing live production problems • have a limited life time
  6. Feature branches • May branch off from: develop • Must

    merge back into: develop • Branch naming convention: anything except master, develop, release-*, or hotfix-* * Feature branches typically exist in developer repos only, not in origin.
  7. Release branches • May branch off from: develop • Must

    merge back into: develop and master • Branch naming convention: release-*
  8. Hotfix branches • May branch off from: master • Must

    merge back into: develop and master • Branch naming convention: hotfix-*