Basic GitHub actions

PSTAT197A/CMPSC190DD Fall 2024

Announcements/reminders

• today, sit with the members of your team (From Wednesday’s section)

• assignment for next time:

  • read MDSR 9.1 – 9.2

  • prepare a reading response

Objective for today

Learn how to interact with GitHub repositories:

• retrieve and submit file changes;

• examine repository updates;

• use branches for parallel workflow;

• resolve conflicts.

Basic Git actions

Communication actions for moving file changes between locations

Branching workflow

Typical use of repository branches for development of new features

Activity overview

1. Make individual changes to files and create ‘commits’
2. Create repository branches to enable you to work more efficiently in parallel.
3. Merge branches with the main branch via pull request.
4. Create and resolve a merge conflict.

Setup

• have everyone open their GitHub client, the sandbox project in RStudio, and the group sandbox repository in the browser on github.com