git for geographers

outline

john and pat demo time!
two different text editors
two different git clients

pat made a project with markdown and geojson
john forks it
  clones
  branches
  commits
  creates PR
pat merges PR
  branches
  commits and merges into master
john branches again
  commits
  PR has merge conflict
  pulls master and resolves
pat wants to make suggestion
  tracks remote
  branches again
  PRs to john
john merges pats PR
pat merges johns PR

yay!

Gah, you must have sent me this via chat not email and I missed it. I ended up writing out my own outline:

1. Create a new project on GitHub
2. Clone project to pat-local
3. Push a commit pat-local to GitHub
4. Switch to john-local
5. Fork project on GitHub
6. Clone fork to john-local
7. Make a commit on john-local and push to the fork on GitHub
8. Open a PR with the changes
9. Switch to pat-local
10. Merge the PR
11. Make a v2 branch
12. Commit to the v2 branch and push it to GitHub
13. Pull latest changes down
14. Resolve merge conflicts
15. Push v2 branch to GitHub
16. Switch to john-local
17. Checkout upstream/v2 branch locally
18. Make some changes and push them to the fork on GitHub
19. Open a PR from john/v2 to upstream/v2
20. Switch to pat-local
21. Review the PR
22. Checkout john/v2 locally
23. Modify local branch for john/v2 and push it to upstream/john-v2
24. Open a PR from upstream/john-v2-changes to john/v2
25. Switch to john-local
26. Merge the PR from upstream/john-v2-changes to john/v2
27. Switch to pat-local
28. Merge PR from john/v2 to upstream/v2
29. Checkout upstream/master
30. Merge v2 into master` and push it to GitHub
    

We should work on syncing this up at some point.

wip: https://johngravois.com/presentations/devsummit/2017/github/

source: https://github.com/jgravois/presentations/tree/gh-pages/devsummit/2017