Please Let Me Merge Before I Start Crying: And Other Things I’ve Said At The Git Terminal

‘Please Let Me Merge’ is geared towards those who may feel comfortable working independently with Git but need some confidence when working collaboratively….
Author

Meghan Harris

Published

August 13, 2024

Description

Just like novice drivers can learn to confidently (and safely!) merge onto (seemingly) intimidating highways, those new to collaborating with Git can also conquer Git merges with some exposure and preparation.

This talk will go over:

  • Different ways R users can interact with Git

  • What Git merges and Git merge conflicts are

  • Real-life examples of Git merges

  • Advice on resolving Git merges

  • Suggestions for cleaner workflows to promote better Git merges

Slides

The slides for the presentation is available on GitHub here.

Recorded Presentation

This presentation was recorded and is now accessible on YouTube here.

Talk Materials and GitHub Repository

This talk has a supplemental GitHub repository that can be accessed here