From a64039a7c6324cce46eb84123762cbe2423a538d Mon Sep 17 00:00:00 2001 From: Jenny Bryan Date: Fri, 17 Jun 2022 12:21:00 -0700 Subject: [PATCH] Updates to early setup --- connect-git-github.Rmd | 6 +++--- connect-rstudio-git-github.Rmd | 10 ++++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/connect-git-github.Rmd b/connect-git-github.Rmd index 15d4aea..66298d9 100644 --- a/connect-git-github.Rmd +++ b/connect-git-github.Rmd @@ -4,9 +4,9 @@ Objective: make sure that you can pull from and push to GitHub from your compute I do not explain all the shell (Appendix \@ref(shell)) and Git commands in detail. This is a black box diagnostic / configuration exercise. -In later chapters and in live workshops, we revisit these operations with much more narrative. +In later chapters and in live workshops, we revisit these operations with much more narrative and discussion of alternative workflows. -I assume you've decided whether to use HTTPS (see chapter \@ref(https-pat) or SSH (see chapter \@ref(ssh-keys)) and you've prepared your credential. +I assume you've decided whether to use HTTPS (see chapter \@ref(https-pat)) or SSH (see chapter \@ref(ssh-keys)) and you've prepared your credential. ## Make a repo on GitHub @@ -30,7 +30,7 @@ cat(res, sep = '\n') ## Clone the repo to your local computer -We have a few ways to do this: with command line Git or via RStudio. +We have a few ways to do this: with command line Git or via RStudio (or, eventually, usethis). ### Clone with command line Git diff --git a/connect-rstudio-git-github.Rmd b/connect-rstudio-git-github.Rmd index 16e8792..a4187c8 100644 --- a/connect-rstudio-git-github.Rmd +++ b/connect-rstudio-git-github.Rmd @@ -18,10 +18,14 @@ We assume the following: * You've confirmed that you can push to / pull from GitHub from the command line (chapter \@ref(push-pull-github)). You will also need a test repository on GitHub. +If you don't have a suitable test repository on GitHub, follow the instructions in the next section. -If you just completed the previous chapter, [Connect to GitHub], that will be perfect! +If you just completed the previous chapter, [Connect to GitHub], that repo will be perfect! However, I encourage you to delete the *local* repository, so you can experience how we use RStudio to clone it and get a local copy. -Delete the folder corresponding to the local repo any way you like. +This is a actually a workflow we refer to elsewhere (see \@ref(burn) as "burn it all down". +It's a deeply pragmatic coping strategy if your local Git repo is goofed up, but the version on GitHub is pretty current. + +Delete the folder corresponding to the **local repo** any way you like. It's just a regular directory on your computer. Here's how to do that in the shell, if current working directory is `myrepo`: @@ -30,8 +34,6 @@ cd .. rm -rf myrepo/ ``` -If you don't have a suitable test repository on GitHub, follow the instructions in the next section. - ## Make a repo on GitHub ```{r echo = FALSE, results = "asis"}