Chapter 38 Ideas for content
38.1 Common workflow questions
38.1.1 Common predicaments and how to recover/avoid
38.1.2 Keep something out of Git
List it in
38.1.3 I didn’t mean to commit that
Committing things you didn’t mean to (too big, secret). How to undo.
38.2 git stuff
Git explainers, heavy on the diagrams
A Visual Git Reference
A successful Git branching model
A successful Git branching model considered harmful
Git Tutorials from Atlassian https://www.atlassian.com/git/tutorials/
Software Carpentry Git Novice Lesson
Michael Freeman slides on Git collaboration
GitHub Training materials
Git for Ages 4 and Up
Learn Git Branching
A Git Workflow Walkthrough Series http://vallandingham.me/git-workflow.html
- Part 1: Feature Branches
- Part 2: Reviewing Pull Requests
- Part 3: Reviewing Pull Requests Locally
- Part 4: Merging Pull Requests
Git from the inside out
38.3 Disaster recovery
Break it down:
- Is something wrong with my filesystem/files?
- Is my git repo messed up?
- How can I keep this from happening again?
Rebase avoidance techniques.
Headless state. Rebase hell.
What to do when you can’t, e.g., switch branches. Stashing and WIP commits.
38.4 Engage with R source on GitHub
- My gist, re: the cran user: https://gist.github.com/jennybc/4a1bf4e9e1bb3a0a9b56
- Recent search for roxygen template usage in the wild: https://github.com/search?utf8=✓&q=man-roxygen+in:path&type=Code&ref=searchresults
Being a useful useR
- stay informed re: development
- use issues for bug reports, feature requests
- make pull requests
38.5 Workflow and psychology
Stress of working in the open
Workflows for group of 1, 2, 5, 10
Fork and Pull vs Shared Repository