Resources for Please Let Me Merge Before I Start Crying: And Other Things I've Said at The Git Terminal
This repository contains supplemental resources and materials that coincide with the "Please Let Me Merge Before I Start Crying: And Other Things I've Said At The Git Terminal" talk at Posit::conf(2024).
"Please Let Me Merge" is geared towards those who may feel comfortable working independently with Git but need some confidence when working collaboratively. 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
This repository serves as a resource for relevant supplemental materials for those seeking to learn more about improving their git workflows to reduce git merge conflicts.
The slides for "Please Let Me Merge" can be found on this repository here.
This talk will be presented on August 13th 2024, 2:40 PM PDT at the Hyatt Regency Seattle (Seattle, Washington) United States. A recording of this talk will be available on YouTube on a later date.
"Please Let Me Merge" introduces three concepts (Communication, Workflow, and Knowledge) that can help collaborators assess, improve, and sustain their workflows within their teams. These concepts aim to mitigate the amount and severity of git merge conflicts experienced while collaborating through git.
-
How to Improve Your Communication Skills | Data Science Hangout Highlights (Video) - Posit PBC w/ Elaine McVey
-
How to Communicate as a Software Developer (Video) - Peter Elbaum
-
Communication Is Just As Important As Code (Blog Post) - Andrea Goulet
-
How to Most Efficiently Communicate With Your Developers (Blog Post) - Luis Paiva
-
6 Tips for Improving Dev Team Communication and Collaboration (Blog Post) - Jenna Bunnell
-
Column Names as Contracts - (Blog Post) Emily Riederer
-
Annotating Code Examples - GitHub Docs
-
Creating a pull request template for your repository - GitHub Docs
-
Managing labels - GitHub Docs
-
About issues - GitHub Docs
-
Pull Request Comments - GitHub Docs
-
Branch Rules and Protection - GitHub Docs
-
Comparing Git workflows: What you should know (Article) - Atlassian
-
What is a Git Workflow (Article) - GitLab
-
Git Branching - Branching Workflows - git scm Documentation
-
The gitflow workflow - in less than 5 mins. (Video) - Devchild
-
Git patterns and anti-patterns for successful developers : Build 2018 (Video) - Microsoft Developer w/ Edward Thomson
-
The
usethispackage's Git functions -
The Repeated Amend (Book Chapter) - Happy With Git R - Jenny Bryan
(*You need to visually see something to learn)
-
Git Tutorial for Dummies (Video) - Nick White
-
Git, GitHub, & GitHub Desktop for beginners (Video) - Coder Coder
-
Resolve Git Merge Conflicts: The Definitive Guide (Video) - The Modern Coder
(*You need to carefully read something to learn)
-
Git Pro Book - Scott Chacon and Ben Straub
-
Happy Git with R - Jenny Bryan
(*You need to do something tangible to learn)
-
saperlipopette Package - Maelle Salmon
-
Learn Git Branching Site - Peter Cottle
-
Oh My Git Game - bleeptrack and blinry
-
Oh S%@t Git | Oh Danggit Git - Katie Sylor-Miller
(*You need to skim for what you need to learn)