Skip to content

Commit

Permalink
Generalise git instruction in README, for developers.
Browse files Browse the repository at this point in the history
  • Loading branch information
andrew-edwards committed Nov 20, 2023
1 parent 9005666 commit b5ebfea
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -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!
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down

0 comments on commit b5ebfea

Please sign in to comment.