Skip to content

Commit

Permalink
Use a pseudo-child document for this too
Browse files Browse the repository at this point in the history
  • Loading branch information
jennybc committed Oct 23, 2021
1 parent b1d4624 commit 4594770
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 26 deletions.
8 changes: 8 additions & 0 deletions child-the-end-of-repo-setup.Rmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Now just "lather, rinse, repeat".
Do work somewhere: locally or on GitHub.
Commit it.
Push it or pull it, depending on where you did the work, but get local and remote "synced up".
Repeat.

Note that in general (and especially in future when collaborating with other developers) you will usually need to pull changes from the remote (GitHub) before pushing the local changes you have made.
For this reason, it's a good idea to try and get into the habit of pulling before you attempt to push.
13 changes: 3 additions & 10 deletions usage-existing-project-github-first.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,6 @@ You should see all the project files you committed there.

If you click on "commits," you should see one with the message you used, e.g. "Init project XYZ".

## The end

Now just "lather, rinse, repeat".
Do work somewhere: locally or on GitHub.
Commit it.
Push it or pull it, depending on where you did the work, but get local and remote "synced up".
Repeat.

Note that in general (and especially in future when collaborating with other developers) you will usually need to pull changes from the remote (GitHub) before pushing the local changes you have made.
For this reason, it's a good idea to try and get into the habit of pulling before you attempt to push.
```{r echo = FALSE, results = "asis"}
cat(readLines("child-the-end-of-repo-setup.Rmd"), sep = '\n')
```
11 changes: 3 additions & 8 deletions usage-existing-project-github-last.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -152,11 +152,6 @@ If this project already had a Git history, it should be reflected on GitHub.

## The end

Now just "lather, rinse, repeat".
Do work somewhere: locally or on GitHub.
Commit it.
Push it or pull it, depending on where you did the work, but get local and remote "synced up".
Repeat.

Note that in general (and especially in future when collaborating with other developers) you will usually need to pull changes from the remote (GitHub) before pushing the local changes you have made.
For this reason, it's a good idea to try and get into the habit of pulling before you attempt to push.
```{r echo = FALSE, results = "asis"}
cat(readLines("child-the-end-of-repo-setup.Rmd"), sep = '\n')
```
11 changes: 3 additions & 8 deletions usage-new-project-github-first.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -226,11 +226,6 @@ You should now see the new line there.

## The end

Now just "lather, rinse, repeat".
Do work somewhere: locally or on GitHub.
Commit it.
Push it or pull it, depending on where you did the work, but get local and remote "synced up".
Repeat.

Note that in general (and especially in future when collaborating with other developers) you will usually need to pull changes from the remote (GitHub) before pushing the local changes you have made.
For this reason, it's a good idea to try and get into the habit of pulling before you attempt to push.
```{r echo = FALSE, results = "asis"}
cat(readLines("child-the-end-of-repo-setup.Rmd"), sep = '\n')
```

0 comments on commit 4594770

Please sign in to comment.