Closed cwickham closed 3 years ago
@erickabsmith OK, I think I'm finished with these comments on the methods section. I'll talk about how to use this PR to incorporate them in our meeting today, but just so it's written down somewhere, I suggest:
Read from top to bottom, some items are changes I've made or suggest, others are comments for you to address.
Suggestions: these show up in a comment, and display the before and after text. You can "Add selection to batch" if you want to accept a suggestion. Then there is a "Commit suggestions" button, at the top of the page, when you are ready too commit all the ones in the batch.
Addressing my comments: the easiest way to keep track of which comments you've addressed is to pull this branch, make the changes, commit and push:
git pull
# or maybe it looks like
git pull origin/review-methods
git checkout review-methods
# browse is RStudio, edit report.Rmd, commit, push
The PR will update to reflect the changes, and you can "Resolve the comment".
Direct edits in the Pull Request: these show up as changed in the file. You can accept these my "Merging the Pull Request", but don't do this until you've accepted all the suggestions you want to, and have addressed the other comments. I.e. this will be final step and takes all the changes I've made, suggestions you've committed, and commits you've added to the PR into your main branch.
Once it is merged, remember to checkout the main
branch in RStudio and Pull, before continuing work. Also OK to delete branch.
Ignore this until I know it will work.