Last active
March 2, 2017 19:45
-
-
Save jgravois/8e114e5fbadae33b51c79465a28d4097 to your computer and use it in GitHub Desktop.
git for geographers
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
wip: https://johngravois.com/presentations/devsummit/2017/github/
source: https://github.com/jgravois/presentations/tree/gh-pages/devsummit/2017