forked from jennybc/happy-git-with-r
-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathnotes-ideas.Rmd
121 lines (71 loc) · 3.21 KB
/
notes-ideas.Rmd
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
# Ideas for content
## Common workflow questions
### Common predicaments and how to recover/avoid
https://twitter.com/JennyBryan/status/743457387730735104
### Keep something out of Git
List it in `.gitignore.`
### I didn't mean to commit that
Committing things you didn't mean to (too big, secret). How to undo.
## git stuff
Git explainers, heavy on the diagrams
https://twitter.com/JennyBryan/status/743548245645791232
A Visual Git Reference
http://marklodato.github.io/visual-git-guide/index-en.html
A successful Git branching model
http://nvie.com/posts/a-successful-git-branching-model/
A successful Git branching model considered harmful
https://barro.github.io/2016/02/a-succesful-git-branching-model-considered-harmful/
Git Tutorials from Atlassian
https://www.atlassian.com/git/tutorials/
Software Carpentry Git Novice Lesson
http://swcarpentry.github.io/git-novice/
Michael Freeman slides on Git collaboration
http://slides.com/michaelfreeman/git-collaboration#/
GitHub Training materials
https://services.github.com/kit/
Git for Ages 4 and Up
<https://www.youtube.com/watch?v=3m7BgIvC-uQ>
Learn Git Branching
http://learngitbranching.js.org
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
https://codewords.recurse.com/issues/two/git-from-the-inside-out
## The repeated amend
A way to commit often, without exposing your WIP on GitHub or without creating a very cluttered history.
Make changes. Reach a decent stopping point. Test, check, if a package ... Render if an analysis .... Nothing broken?
Commit. **Don't push.**
Make more progress. Keep testing or checking or rendering. Inspect diffs to watch what's changing.
Are things broken? Use an appropriate reset to fall back.
Are things improving? Commit but **amend** the previous commit.
Keep going like this until you've built up a commit you can be proud of.
**Now push.**
It is important to not push amended commits unless you really know what you're doing and you can be quite sure that no one else has pulled your work.
## Disaster recovery
<http://stackoverflow.com/questions?sort=votes>
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.
## Engage with R source on GitHub
Browsing
Searching
* 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
## Workflow and psychology
Stress of working in the open
Workflows for group of 1, 2, 5, 10
* Fork and Pull vs Shared Repository
- <https://help.github.com/articles/about-collaborative-development-models/>
- <https://help.github.com/articles/using-pull-requests/>