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

More Git and GitHub Secrets

More Git and GitHub Secrets

This talk covers both Git and GitHub: different tricks I've picked up after three years at GitHub, helpful advice on common gripes I've seen in support tickets and tweets, and just general nifty things that make you a faster, more capable technologist.

Zach Holman

July 24, 2013
Tweet

More Decks by Zach Holman

Other Decks in Programming

Transcript

  1. This talk throws a ton of stuff at you (Not

    unlike James Cameron’s Avatar™, btw)
  2. git merge master -s ours “Give me master, but my

    final state should match my current branch” merge strategies
  3. git merge master -s ours Great for when your long-running

    branch will supersede master merge strategies
  4. git merge master \ -s recursive -X patience merge strategies

    Be er line matching for logical groups
  5. { :a => :b } { :c => :d }

    merge strategies — patience
  6. { :a => :b +} + +{ + :c =>

    :d } merge strategies — patience
  7. { :a => :b } +{ + :c => :d

    +} merge strategies — patience
  8. task lists - [ ] Use NoSQL - [ ]

    Use today's trendiest language - [ ] Do what our VC tells us - [ ] Comment on Hacker News - [ ] Profit
  9. task lists - [x] Use NoSQL - [x] Use today's

    trendiest language - [x] Do what our VC tells us - [x] Comment on Hacker News - [ ] Profit