From b5ebfea7e0deba7a406c5ae60449e0916b14517e Mon Sep 17 00:00:00 2001 From: andrew-edwards Date: Sun, 19 Nov 2023 19:13:00 -0800 Subject: [PATCH] Generalise git instruction in README, for developers. --- README.Rmd | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.Rmd b/README.Rmd index 3546df61..e9b9b168 100644 --- a/README.Rmd +++ b/README.Rmd @@ -409,7 +409,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 checkout main` - - `git merge dev-andy` + - `git merge dev-yourname` - `git push` And you are done! diff --git a/README.md b/README.md index b1a1a1c9..6a1d6d6b 100644 --- a/README.md +++ b/README.md @@ -399,7 +399,7 @@ If that does merge in some new commits then you should that people will get them when they install/update `pacea`: - `git checkout main` -- `git merge dev-andy` +- `git merge dev-yourname` - `git push` And you are done! If you want, we have some aliases (such as `git co`