Stop numbering files, Act Five

_bookdown.yml

@@ -40,8 +40,9 @@ rmd_files: [
   "git-branches.Rmd",
   "git-remotes.Rmd",
 
-  "40_workflow-pull.Rmd",
-  "49_workflow-explore-extend-pull-request.Rmd",
+  "workflows-intro.Rmd",
+  "workflows-pull.Rmd",
+  "workflows-explore-extend-pull-request.Rmd",
 
   "50_prompt-clone.Rmd",
   "51_prompt-fork.Rmd",

workflows-intro.Rmd

@@ -0,0 +1,26 @@
+# (PART) Daily workflows {-} 
+
+# Doing your work (and undoing it) {#workflows-intro .unnumbered}
+
+*most of this only exists in workshop materials but will eventually be recorded here as well*
+
+Git patterns that come up frequently in real work:
+
+  * Commit early and often. The Repeated Amend.
+  * Burn it all down.
+  * Fork and clone.
+  * Adding a remote.
+  * Branching.
+  * Time travel:
+    - "I just need to see the past". Browse and search on GitHub.
+    - "I need to visit the past". Create a checkout a branch.
+    - "I want to return to the past". `git revert`, `git reset`
+    - "I had a great cookie last October". `git cherry pick`, `git checkout REF -- path`
+  * [Can't push due to upstream changes?](#pull-tricky)
+    - Pull (rebase? merge?), then push. Yay. 
+    - Pull, oops merge conflicts, abort. Come back later.
+    - Pull, oops merge conflicts, resolve them. Push.
+
+Collaborative development:
+
+  * [Explore and extend a pull request](#pr-extend)