Skip to content

Instantly share code, notes, and snippets.

@kellishouts
Forked from theRemix/README.md
Last active August 13, 2016 02:35
Show Gist options
  • Save kellishouts/ff1e5396866c968d93e7b541a49de3d7 to your computer and use it in GitHub Desktop.
Save kellishouts/ff1e5396866c968d93e7b541a49de3d7 to your computer and use it in GitHub Desktop.
Git Flow

Git Flow

Prerequisites

This material should be covered at the beginning of, or just before the final student project. Basic git knowledge is required, intermediate experience with CLI and git is preferred.

Class Format / Time to Allow for Subject

This material usually takes less than an hour to introduce and will be in use throughout the final project.

Topics & Expected Outcomes

Levels of Understanding

Students will have one of three levels of understanding about each topic upon completion of this module.

  • grok: fully understand the topic in order to replicate code, communicate, and explain concepts without referring to any notes.
  • explain: understand enough about the topic to describe concepts without referring to notes.
  • know about: understand enough to look up further documentation when asked about the subject.

  • Students should be able to demonstrate and explain Git Flow branching on single repo strategy
  • Students should be able to demonstrate and explain Git Flow forking strategy

Suggested Format for Delivery

The following format is meant to be a guideline for effective delivery. Instructors can present material in another way if it is more effective for the students.

Introduce Git Flow

  1. install git-flow
  2. osx users install git-flow-av
    • explain the difference, and advantages
  3. git flow init
  4. git flow feature
  5. git flow release
  6. git flow hotfix
  7. git flow publish

Introduce GUI tools

  1. introduce OSX GUI Tools
    • Git Kraken
    • Tower.app
    • SourceTree.app
    • Kaleidescope.app for diffs
  2. introduce Linux GUI Tools
    • Git Kraken
    • gitk
    • SmartGit
  3. install Git Kraken

Exercises & Projects

No exercises for this topic.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment