nhs-r-community/intro-git-github

Introduction to Git and Github using RStudio and R

Introduction to Git and GitHub

Introduction to Git and GitHub training based on the Forwards workshops:

Setting up your system and Your first package as part of the one-hour package development series.

Part 1

• Prework - Get set up on a computer
• Introduction - What is version control?
• Setting up - Getting started with Git and GitHub

Break

Break

• Version Control - What is Git/GitHub and how they relate to RStudio along with the ups and downs of Git
• Workflow - Brief introduction to the Git and GitHub terminology
• Workflow with {usethis} and {gert} - start work and making a commit

Part 2

• Pull Requests (PRs) - making pull request, pausing, resuming and finishing
• Merge conflict! - repeat steps from previous session and create a conflict merge

Break

Break

• Commit to main (and undo last commit!) - how committing is possible to the main and undo last commits
• Undo last merge - undoing a merge (reverting a pull request)
• Existing repositories - Getting copies of existing repositories

Appendix slides

{usethis} errors - typical errors from set up issues

intro-git-github's Issues

Slides lose content on full screen

When on full screen, some lines of slides are lost.

Additional code which is useful

• gert::git_add(".") adds all files. Explain that the dot refers to "all" in this context and is used in other direct git commands.
• Ctrl+Shift+K renders a Quatro document

Redirect the website through nhsrcommunity.com

Remove duplicate acknowledgements slide

https://intro-git-github.nhsrcommunity.com/session-pull-requests.html#/acknowledgements-1

Remove break slide and redirect to assets repository in README

http://assets.nhsrcommunity.com/quarto-slides/session-break-slide.html#/title-slide

Highlight sooner the misspelling of "quatro" is on purpose

Add a call out earlier to say that quatro is supposed to be a misspelling which will get corrected later to quarto.

Expand on function to clone/fork from GitHub

Because this defaults to the default working directory this will need over writing in the function - and also causes a bit of a logical loop in RStudio Cloud as it creates a project within a project.

Update the CSS colours

Move slides to section

Slides relating to pr_pause, pr_forget and so on to a separate section to allow the original slide chapter to focus solely on commit, push and finish.

Features in GitHub worth highlighting

• Settings - to change private to public and vice versa
• Kanban Project boards
• Issues
• Conversations relating to particular lines of code in an PR