Skip to content

Latest commit

 

History

History
16 lines (12 loc) · 664 Bytes

part2.asciidoc

File metadata and controls

16 lines (12 loc) · 664 Bytes

Git/GitHub Intro Part 2

Ideas for Breaking Up Git Intro

  1. Git/GitHub as a sole author (create repository, commit, push)

  2. Git/GitHub as a contributing author (commit, push, fetch, pull, stash, merge)

  3. Git/GitHub as a reuser (fork, commit, fetch, pull, merge to development branch)

  4. Git/GitHub as a contributing reuser (fork, checkin, create pull request, keep up-to-date (fetch/pull))

  5. Git/GitHub as a publisher (respond to pull requests, create releases, use issue tracking system)

Other Things to Cover

  • Branch naming (feature/bug branches, development, master, releases)

  • Use of stash

  • Merge conflicts

  • Rebasing, including interactive rebase