$30 off During Our Annual Pro Sale. View Details »

HackRU2013-GH

 HackRU2013-GH

Git, GitHub, and workflows.

Brian Levine

March 28, 2013
Tweet

Other Decks in Programming

Transcript

  1. Git and GitHub
    Workflows
    for
    Fun and Profit

    View Slide

  2. Brian Levine
    GitHub:
    @balevine
    Email:
    [email protected]
    Twitter:
    @Brian_A_Levine
    (but don't bother)

    View Slide

  3. View Slide

  4. version control is awesome

    View Slide

  5. version control is awesome
    distributed
    even more
    ^ ^

    View Slide

  6. git repository : all your code

    View Slide

  7. git repository : all your code
    all of its history

    View Slide

  8. git repository : all your code
    all of its history
    all collaborators

    View Slide

  9. git repository : all your code
    all of its history
    all collaborators
    all the time

    View Slide

  10. commit early
    commit often
    “git commit
    should be used as often as
    ctrl+s”
    - someone I once overheard

    View Slide

  11. branching
    master

    View Slide

  12. branching
    master
    cool-feature

    View Slide

  13. branching and merging
    master
    cool-feature

    View Slide

  14. branching and merging
    real life is messy

    View Slide

  15. remotes
    https://github.com/balevine/impress.js
    URL specific

    View Slide

  16. remotes
    git fetch
    git merge
    git pull
    fetch stuff

    View Slide

  17. remotes
    git fetch
    git merge
    git pull
    fetch stuff
    git push
    push stuff
    and

    View Slide

  18. View Slide

  19. remote repositories
    GitHub gives you

    View Slide

  20. remote repositories
    interface for git
    GitHub gives you

    View Slide

  21. remote repositories
    interface for git
    forking
    GitHub gives you

    View Slide

  22. remote repositories
    interface for git
    forking
    merging
    GitHub gives you

    View Slide

  23. tools for sharing
    GitHub gives you

    View Slide

  24. ideas / problems
    and
    solutions
    Issues Pull Requests
    and

    View Slide

  25. bug tracking
    Issues

    View Slide

  26. bug tracking
    feature requests
    Issues

    View Slide

  27. bug tracking
    feature requests
    cool ideas
    Issues

    View Slide

  28. ask someone to
    merge your
    changes into their
    repository or
    branch
    Pull Requests

    View Slide

  29. just what it sounds like
    Pull Requests

    View Slide

  30. just what it sounds like
    but more
    Pull Requests

    View Slide

  31. code review
    Pull Requests

    View Slide

  32. code discussion
    Pull Requests

    View Slide

  33. let's talk about
    workflows

    View Slide

  34. should be intuitive
    workflows

    View Slide

  35. should be easy
    workflows

    View Slide

  36. fork a repository
    Fork and Pull

    View Slide

  37. fork a repository
    make a pull request
    Fork and Pull

    View Slide

  38. here's how we roll
    master is stable

    View Slide

  39. here's how we roll
    master is stable
    topic branches for everything

    View Slide

  40. here's how we roll
    master is stable
    topic branches for everything
    commit locally

    View Slide

  41. here's how we roll
    master is stable
    topic branches for everything
    commit locally
    push often

    View Slide

  42. here's how we roll
    master is stable
    topic branches for everything
    commit locally
    push often
    pull request to discuss

    View Slide

  43. here's how we roll
    master is stable
    topic branches for everything
    commit locally
    push often
    pull request to discuss
    merge to master when ready

    View Slide

  44. all together now
    commit early and often

    View Slide

  45. all together now
    commit early and often
    use branches wisely

    View Slide

  46. all together now
    commit early and often
    use branches wisely
    use Issues for bugs and features

    View Slide

  47. all together now
    commit early and often
    use branches wisely
    use Issues for bugs and features
    use Pull Requests for code

    View Slide

  48. all together now
    commit early and often
    use branches wisely
    use Issues for bugs and features
    use Pull Requests for code
    find a workflow that's good for you

    View Slide

  49. all together now
    commit early and often
    use branches wisely
    use Issues for bugs and features
    use Pull Requests for code
    find a workflow that's good for you
    (but we think ours rocks)

    View Slide

  50. there's a whole world of
    good stuff out there
    teach.github.com
    training.github.com

    View Slide

  51. stalk follow me for more info
    and fun pictures of my dogs
    or email me your questions
    @Brian_A_Levine
    [email protected]

    View Slide