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.

78b475797a14c84799063c7cd073962f?s=128

Zach Holman

July 24, 2013
Tweet

Transcript

  1. 2.
  2. 6.

    This talk throws a ton of stuff at you (Not

    unlike James Cameron’s Avatar™, btw)
  3. 8.
  4. 9.

  5. 15.

    git merge master -s ours “Give me master, but my

    final state should match my current branch” merge strategies
  6. 16.

    git merge master -s ours Great for when your long-running

    branch will supersede master merge strategies
  7. 18.

    git merge master \ -s recursive -X patience merge strategies

    Be er line matching for logical groups
  8. 20.

    { :a => :b } { :c => :d }

    merge strategies — patience
  9. 21.

    { :a => :b +} + +{ + :c =>

    :d } merge strategies — patience
  10. 22.

    { :a => :b } +{ + :c => :d

    +} merge strategies — patience
  11. 102.
  12. 103.
  13. 104.
  14. 105.
  15. 122.
  16. 123.
  17. 124.
  18. 125.
  19. 128.
  20. 129.
  21. 130.
  22. 141.
  23. 142.
  24. 145.
  25. 146.
  26. 147.
  27. 148.
  28. 149.
  29. 150.
  30. 154.
  31. 155.
  32. 156.
  33. 157.
  34. 161.
  35. 169.
  36. 171.

    task lists - [ ] Use NoSQL - [ ]

    Use today's trendiest language - [ ] Do what our VC tells us - [ ] Comment on Hacker News - [ ] Profit
  37. 172.
  38. 173.
  39. 174.

    task lists - [x] Use NoSQL - [x] Use today's

    trendiest language - [x] Do what our VC tells us - [x] Comment on Hacker News - [ ] Profit
  40. 175.
  41. 176.
  42. 177.
  43. 178.
  44. 180.
  45. 182.
  46. 183.
  47. 186.