Office Hours Notes for 2012-06-11

officehours.md

• Matthew
  • Command line is the verb learning
• Tim Berglund
  • Stick before automatic
  • Hard first, easy later
  • Learn some internals, data structures
  • GUI you use today (Tower today?)
    • Transition between GUIs easier
    • Switch to something else
• GUI == Graphical User Interface
• Git Commit
  • More languages now in Git
  • Game Designers
  • Java Devs
  • Front end, designers
• Is the GitHub app limited compared to the Command Line?
  • Yes, but...
  • Small number (dozen commands) to be proficient
  • 145 total commands (you don't need all these to be proficient)
  • Architectural Git Concern
    • Really, we code
    • 95% of what you want to do day-to-day
    • Git has an onion skin API
• Git GUIs
  • gitk --all
  • SmartGit
  • GitX (L)
• Removing a bad file
  • git rm
  • git filter-branch
  • https://github.com/matthewmccullough/git-workshop/tree/master/examples/filter-branch
  • Make modifications to history at each commit
  • "If this has bad.iso, delete it and re-write commit"
  • If you try to push it to GitHub. DENIED!
  • Force push (overwriting old history)
• Deleting Branches that are no longer needed
  • Deleting branches
  • Might have merged it
  • Or it was junk (Matthew has this problem)
  • git branch -d BRANCHNAME
    • Protects you. Only deletes merged branches.
  • git branch -D BRANCHNAME
    • Force the deletion
• How vs. Why (Focus on Why?)
  • http://git-scm.com/book
  • http://delicious.com/matthew.mccullough/git+tutorial
• Feature
  • Matthew is just a trainer (caution!)
  • Hide code from a collaborator
  • File issues, but not see code (until done)
  • Workaround (2 repos)
    • One for issues
    • One for code
    • ZenDesk for tickets
  • Submodules
    • Superproject owns issues
    • Submodule for code
    • No permission on subproject
    • Subtree merge to fold the submodule superproject
    • http://git-scm.com/book/en/Git-Tools-Submodules
    • http://git-scm.com/book/en/Git-Tools-Subtree-Merging
• Repository Formats
  • .git folder
  • objects
• Writing code, touches database
  • Maintain SQL Server Alteration Scripts
  • Submodule approach for scripts
  • Downloaded Core Code