Skip to content

Commit

Permalink
Spell out a git abbreviation in README; tweak instructions at top.
Browse files Browse the repository at this point in the history
  • Loading branch information
andrew-edwards committed Nov 20, 2023
1 parent cd5bfdc commit 9005666
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
7 changes: 5 additions & 2 deletions README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ output: github_document
<!-- README.md is generated from README.Rmd. Please edit that file -->
<!-- build_readme() will build this when developing, but installs pacea from -->
<!-- scratch (and it might not be the local version) so it's much quicker to do -->
<!-- rmarkdown::render("README.Rmd"), which also builds an .html that can be -->

<!-- rmarkdown::render("README.Rmd")
which also builds an .html that can be -->

<!-- viewed locally (and isn't pushed to GitHub) -->

<!-- Figures - to update a figure, manually run the piece of code that makes -->
Expand Down Expand Up @@ -405,7 +408,7 @@ step will not have added any new code.

5. Now you are ready to merge your changes into the main branch, so that people
will get them when they install/update `pacea`:
- `git co main`
- `git checkout main`
- `git merge dev-andy`
- `git push`

Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
<!-- README.md is generated from README.Rmd. Please edit that file -->
<!-- build_readme() will build this when developing, but installs pacea from -->
<!-- scratch (and it might not be the local version) so it's much quicker to do -->
<!-- rmarkdown::render("README.Rmd"), which also builds an .html that can be -->
<!-- rmarkdown::render("README.Rmd")
which also builds an .html that can be -->
<!-- viewed locally (and isn't pushed to GitHub) -->
<!-- Figures - to update a figure, manually run the piece of code that makes -->
<!-- the .png file. See notes below (and Issue #44). -->
Expand Down Expand Up @@ -397,7 +398,7 @@ If that does merge in some new commits then you should
5. Now you are ready to merge your changes into the main branch, so
that people will get them when they install/update `pacea`:

- `git co main`
- `git checkout main`
- `git merge dev-andy`
- `git push`

Expand Down

0 comments on commit 9005666

Please sign in to comment.