/git_flow

Primary LanguageJavaScript

What would you like to learn? What questions would you like answered?

...

Assumptions

...

Agenda

  • git commands/worfklow
    • reset commit soft/hard
    • resolving conflicts
  • branching/merging
    • creating branches
    • merge vs. rebase
  • PR workflow
  • current Qwinix workflow
    • description
      • merge forward
    • pros cons
  • story about Vested project
  • git flow
    • description
    • pros cons
  • release branches
  • random hacks
  • subl setup
    • ln -s "/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl" ~/bin/subl
  • sublime config
  • oh-my-zsh
  • aliases
  • t on github