Lecture Notes: Building a Better Tomorrow

[al-the-x]

• Progress Review
  • merging and rebasing
  • code review
• Tools on Tuesday
  • A Better Branching Model
    • What is git-flow...?
    • brew install git-flow-avh (not git-flow, it's old)
    • git flow
  • A Better Generator
    • npm install -g generator-gulp-webapp
    • yo gulp-angular and just look around
    • Ruh-roh, Raggy...
    • git checkout . && git clean
    • We like to git mv it...
      • src to app
      • src/js to app/scripts
      • src/scss to app/styles
    • yo gulp-angular now... What? Conflicts?
    • git difftool to the rescue!
    • Now what can we do?
      • gulp --tasks... so. many. things.
      • Maybe just gulp...?
      • jshint
      • "use strict";
    • Time to commit...
  • Global Thermonuclear War
    • npm install -g generator-angular
    • yo angular:controller

Workflow Models

• Why git is better than X: Any Workflow by Scott Chacon
• Comparing Workflows by Atlassian
• Understanding the git Workflow by Ben Sandofsky
• Branching Workflows and Distributed Workflows on git-scm.com
• Also, Google: "git workflow"

---

This change is