Please Let Me Merge Before I Start Crying

And Other Things I’ve Said At The Git Terminal

I Can’t Do This

… this phrase every time I’ve felt victimized by Git. But today, I come to you from the other side of the elusive second learning curve that comes with using Git. You know, because

Git’s First Learning Curve

You have the initial challenge of just learning to use Git, but then you have the..

Git’s Second Learning Curve

..the additional mountain to climb when learning how to handle merges and conflicts so you can use it collaboratively.

This talk today is geared towards those of you who may feel that you’re

Git’s Second Learning Curve

Right here in the middle.
Maybe, you’ve figured out the basics of Git and have
have even done a few merges already
but might be a little hesitant like I once was to even deal with merge conflicts.
Understanding Git merges and conflicts felt impossible at first, but it started to make sense when I realized that using Git collaboratively is alot like…

Git is like Driving

Driving.. So let me give an example
Last spring, I took a long road trip that I’ve done many times.
However, this time was different because it was the first time I was doing the drive with my teething baby and my well-meaning but slightly overbearing mother in tow.
For me, this scenario was similar to my experiences *using git collaboratively…

Long Road Trips Require Planning

..Just like I make compulsive packing lists before my road trips…

Collaborating With Git Requires Planning

…I also make compulsive task lists to prepare myself for Git merges.

Road Trips are a Journey from Point A to Point B

Getting my precious cargo from point A to point B on this road trip…

Merging in Git is like a Journey from Point A to Point B

..felt like getting my precious code from my local computer to the git repository via git merge…

I Work well on Road Trips with my Husband

My supportive husband that I worked well with when parenting on this trip

My Team at the PCCTC and I work well outside of Git

Could be considered any one of my awesome coworkers I usually work with outside of Git.

My Mom is well-meaning, smart, and just wants to help, even if too much

Having my mother in the car, providing maybe a little too much love and care to my baby…

Git does so much on its own, and just wants to help, but can make the process hard sometimes

…felt like Git wanting to help me with my code, but actually creating more work for justified reasons.

needless to say, I was Stressed on this road trip. I knew how to take care of my baby and drive, but I suddenly felt like I had to learn these things all over again.

And honestly, I felt the same with Git. To understand how to work collaboratively with Git, I realized I needed to have a better understanding of it, because that lack of knowledge lead me to say things like…

Please Let Me Merge Before I Start Crying

These phrases stem from desperation and frustration
Because we don’t understand
So before we talk about merges, conflicts, and collaboration let’s talk about some quick things we should understand about Git…

Quick Things to Understand About Git

• Git ≠ GitHub
  • Git: Version Control System
  • GitHub: Developer Platform that uses Git Software

• Three ways (R Users) can interact with Git
  • A CLI Terminal
  • The RStudio GUI | Positron w/ Extensions
  • A Third Party Client (e.g. GitHub Desktop)

• not interchangeable
  
• Briefly - touch on - GH personal workflow later..
  
• SAY definitions
  
• the fact that alot of people mix these words up is proof that
  
• reliable ways to interact with git
  
• Which for R Users are (click)
  
• Command line interface

Do Whatever You want

• Github isn’t the only platform
  
• DS card revoked - for Not using the terminal
  
• But just do what makes sense for your skills & sitch
  Let’s talk about the git merge.

What is a Git Merge?

“Join two or more development histories (Branches) together”

Git Merge Docs (“Git - git-merge Documentation”)

• Merges come in different flavors
  
• Usually via pushes
  
• when pushing new work up…and
  

What is a Git Merge?

“Join two or more development histories (Branches) together”

Git Merge Docs (“Git - git-merge Documentation”)

• pulls when pulling new work down
  
• No matter the type, Merges -> important
• b/c allow for us to safely modify work when collaborating w/ others
  
• That’s all a merge is… so seems simple enough…
  
• why scary?

Why is a Git Merge Scary?

Why is a Git Merge Scary?

It’s Not…

Why is a Git Merge Scary?

It’s Not…

…No really

If scared of merges, might I suggest.. scared of conflicts?

People are afraid of git merge conflicts

• if so? that’s ok. judgment-free zone
  
• I believe to start conquering fears
  
• Learn about what you’re dealing with
  
• So let’s take a moment to understand them

What is a Git Merge Conflict?

“Competing changes are made to the same line of a file”

- GitHub Docs (“Resolving a merge conflict using the command line”)

• Occurs in..

What is a Git Merge Conflict?

“Competing changes are made to the same line of a file”

“When someone edits a file and someone else deletes the same file.”

- GitHub Docs (“Resolving a merge conflict using the command line”)

-To further contextualize - Only 2

What is a Git Merge Conflict?

Content

“Competing changes are made to the same line of a file.”

• conflict in Actual content (lines of code)

What is a Git Merge Conflict?

Content

“Competing changes are made to the same line of a file.”

Structure

“When someone edits a file and someone else deletes the same file.”

• conflicts w/ Modification/Deletion of folder itself
  

• doesn’t seem to scary at first glance
  

• But, there has to be a reason people are afraid of merge conflicts
  

• Let’s actually look at simple scenario that was similar to something that happened at my job to see if these things are really scary or not…

• one day someone asked me to help resolve a conflict

Simple Merge Conflict Example

So what had happened was:
two coworkers created local branches off master
all repos have a simple text config file with data cut dates in them
when started -> same vs of config file

Simple Merge Conflict Example

• coworker 1 finishes
  
• changed config file to go w/ work
  
• pushes/merge np
  
• meanwhile cw 2 in iteration hell w/ the orig vs.

Simple Merge Conflict Example

when Cw2 finished, had to update config file
THEIR version of the config file is different
Now they have a merge conflict
So, ok. we have the scenario, let’s see what this conflict looks like in the code

Simple Merge Conflict Example

• Both versions
  (Repository and CoWorker # 2s)
• Content conflict - line 5 - > diff dates
  
• so, when cw #2 attempted to merge, the resulting conflict looked like…

Simple Merge Conflict Example

#=============================#
# Data Cut Dates---------------
#=============================#

<<<<<<< HEAD
main_data_cut: "2024-06-01"
=======
main_data_cut: "2024-01-01"
>>>>>>> master
vendor_1_data_cut: "2023-12-13"
vendor_2_data_cut: "2024-01-05"
vendor_3_data_cut: "2023-12-15"

If this is giving you anxiety, it’s ok
may help w/ anxiety -> every conflict
3 components - no matter how complex

Simple Merge Conflict Example

#=============================#
# Data Cut Dates---------------
#=============================#

<<<<<<< HEAD
main_data_cut: "2024-06-01"

Top of conflict is usually the branch/commit YOU are on and trying to merge
Youll see conflict marker- “less-than” signs (start of conflict)
Then conflicted code on your branch

Simple Merge Conflict Example

#=============================#
# Data Cut Dates---------------
#=============================#

<<<<<<< HEAD
main_data_cut: "2024-06-01"
=======

• conflict divider (equal) which separates Your version of code..

Simple Merge Conflict Example

#=============================#
# Data Cut Dates---------------
#=============================#

<<<<<<< HEAD
main_data_cut: "2024-06-01"
=======
main_data_cut: "2024-01-01"
>>>>>>> master

• From the version you are trying to merge into
  
• This case, master repository
  last conflict marker (greater-than) signs -> end

Simple Merge Conflict Example

#=============================#
# Data Cut Dates---------------
#=============================#

<<<<<<< HEAD
main_data_cut: "2024-06-01"
=======
main_data_cut: "2024-01-01"
>>>>>>> master
vendor_1_data_cut: "2023-12-13"
vendor_2_data_cut: "2024-01-05"
vendor_3_data_cut: "2023-12-15"

• Everything after that is code that is not conflicted, same of both vs, so left alone
  So now that we know:
  - what happened and what the conflict looked like
  - how to resolve?
  - Well, when coworker # 2 came to me and asked me that
  I asked them…
  -their response was - next slide…

Oh

• cw2 didnt realize they just had to decide which date
• saw conflict -> spooked
• and broke the 1st rule of dealing w/ conflicts which is:

Resolving Git Merge Conflicts

1. Don’t Panic

Easier said than done
biggest reason to not panic is…

Resolving Git Merge Conflicts

1. Don’t Panic

• Usually, conflicts aren’t a big deal

• You are (hopefully) the expert
• Walk away if you need to…

• have to remember -> you are XPT
• in that ex.. I had to ask which date
  
• cw2 was expert and knew the answer…
  
• Now, some ppl may panic b/c -> realize they can’t do anything w/ git when conflict
  
• so if not ready or calm you can (click)…
  
• If rstudio use like myself.. 2 ways to “tuck and roll”

Resolving Git Merge Conflicts

git merge --abort

• Rstudio -> no pretty icons for aborting merge
  
• in rstudio tab or outside of it
  
• type it directly
  
• time machine
  
• saved work - safe

Resolving Git Merge Conflicts

Have a Third Party handle it…

• i.e: switch to ghd, to project repo -> pop-up and click
  
• when ready to tackle, 2nd thing to do is..

Resolving Git Merge Conflicts

2. Assess the Damage

• like i said, most aren’t bad - could be simple.

Resolving Git Merge Conflicts

2. Assess the Damage

• You can use the terminal via git status

git will usually tell you in the terminal what the problem is
but git status works too

Resolving Git Merge Conflicts

2. Assess the Damage

• You can use the terminal via git status
• You can use the RStudio GUI

• Rstudio git pane - status icons
  
• each icon means…

Resolving Git Merge Conflicts

2. Assess the Damage

• You can use the terminal via git status
• You can use the RStudio GUI

• One you want to look for is…

Resolving Git Merge Conflicts

2. Assess the Damage

• You can use the terminal via git status
• You can use the RStudio GUI

quickly tells you

Resolving Git Merge Conflicts

2. Assess the Damage

• You can use the terminal via git status
• You can use the RStudio GUI
• You can use a Third Party

• Want even more interaction - use a third party
  
• if you’re lucky… you can even use

Resolving Git Merge Conflicts

2. Assess the Damage

• You can use the terminal via git status
• You can use the RStudio GUI
• You can use a Third Party
• You can use a Developer Platform (sometimes)

• Trying to merge on platform via PR
  
• instead of seeing “merge”, may see this
  
• conflict is simple enough to resolve on platform

Resolving Git Merge Conflicts

3. Choose Your Own Adventure

what do I mean? let’s think back to ex…

Resolving Git Merge Conflicts

#=============================#
# Data Cut Dates---------------
#=============================#

<<<<<<< HEAD
main_data_cut: "2024-06-01"
=======
main_data_cut: "2024-01-01"
>>>>>>> master
vendor_1_data_cut: "2023-12-13"
vendor_2_data_cut: "2024-01-05"
vendor_3_data_cut: "2023-12-15"

• When I asked cw 2 which date
  
• important concept didn’t realize
  
• git was smart enough -> conflict
• but not smart enough to know how to resolve

Resolving Git Merge Conflicts

• You are in control!
• You can choose your code
• Or “their” code…

• Thinking back to my xps …I felt conflict markers made it obvi
• That git wanted me to pick one or the other…
• but Something I had a hard time wrapping my head around
  
• what git was expecting of me …
  
• Like, literally How??
  
• manually edit the file
  
• let’s look at ex of what git expects you to do..

Resolving Git Merge Conflicts

• ~narrate what’s happening here~
  
• never realized this is what git wanted
  
• the situation here is primitive…
• because git is relying on you to tell it what needs to move forward..

Resolving Git Merge Conflicts

• ~Don’t linger here~
• You can literally fling yourself into the void
• You can make something completely new
• doesn’t have to be one or the other
• you can leave the conflict markers in (code wont work)
• you can even throw in SOME…

Anything Goes

⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣀⣀⣀⣤⣤⣤⣄⣀⣀⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⡤⣄⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣠⠤⠖⣚⣩⣭⣥⣶⣶⣶⣶⣶⣶⣶⣬⣭⣙⣛⠲⢦⣄⡀⠀⠀⠀⠀⠀⠀⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣸⢰⣮⣧⡀⠀⠀⠀⠀⣀⠴⢚⣩⣴⣾⣿⣿⣿⣿⣿⣿⣿⣿⡿⢿⣛⢻⣿⣿⣿⣿⣿⣷⣮⣝⡳⢦⣄⠀⠀⠀⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⡇⣿⣿⣿⣿⣦⣀⡴⢚⣵⣾⣿⣿⣿⣿⣿⢿⣟⣿⡽⣛⣭⡶⠿⢿⣿⣹⣿⣿⡿⣿⣿⣿⣿⣿⣿⣷⣜⡻⢦⡀⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣯⣿⣿⣿⣿⡿⢫⣶⣿⣿⣿⣿⡿⣿⣽⣾⣿⡿⣽⡾⠛⠉⠀⠀⣼⣟⣿⣿⣿⣿⣿⣷⣿⣿⣿⣿⣿⣿⡿⠮⠿⠷⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢳⣹⣿⣿⢟⣼⣿⣿⣿⣿⢿⣷⣿⣿⣟⣿⡿⣿⣿⣦⣄⠀⠀⢠⣿⣽⣿⣿⣿⣿⣿⣿⠟⠛⠉⠁⠀⠀⠀⠀⠀⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⡾⣛⢻⣾⣿⣿⡿⣿⣾⣿⣿⣽⣾⣿⣟⣿⣿⣻⣿⣿⣷⣀⣾⢿⣿⣿⡿⣿⣿⣿⣿⣳⣄⡀⠀⠀⠀⠀⠀⠀⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣾⣿⣿⣇⣿⣿⣟⣿⣿⣯⣷⣿⡿⣯⣷⣿⣿⣻⣿⣷⣿⣿⣿⣿⣿⣿⡿⣿⣿⣷⣿⣿⣿⣷⣝⢦⡀⠀⠀⠀⠀⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢻⣿⠟⣿⣹⣿⢿⣻⣷⣿⣿⣽⣿⡿⣿⡿⢛⣩⣤⣦⣭⡻⣷⣿⣿⣻⣿⢿⣷⡿⣿⣾⡿⣿⣿⣷⡝⢦⡀⠀⠀⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠸⣿⠀⣿⣿⣻⣿⣿⢿⣷⣿⣻⣷⡿⣣⣾⣿⠟⠛⠻⣿⣿⣿⣿⣽⣿⢿⣿⣻⣿⡿⣷⣿⣿⢿⣿⣿⣦⠳⡄⠀⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢳⠀⠸⣿⣿⣿⣾⣿⣿⣽⣿⢯⣿⠟⠋⠀⠀⠀⠀⠘⣿⣿⣾⣿⣻⣿⣿⣟⣿⣿⢿⣯⣿⣿⢿⣿⣿⣧⠹⡄⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⠀⠀⢹⣿⢿⣿⣿⣾⢟⣽⠟⠁⢀⡶⡀⠀⠀⠀⢰⣿⣿⣷⣿⢿⣟⣿⣿⣿⣿⣿⣿⣯⣿⣿⡿⣿⣿⣇⢳⡀⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣀⡀⠀⠀⠈⡧⣾⡶⣿⡿⢭⣫⢵⠟⠁⠀⠀⣼⣿⡇⠀⠀⢠⣿⣿⣿⣾⣿⡿⣿⣿⣿⣿⣻⣿⣿⣿⣿⣷⣿⣿⣿⣿⡈⣇⠀
⠀⠀⠀⠀⠀⠀⠀⢀⣠⣀⠀⠀⠀⠀⢀⠞⠁⠈⢱⠀⠀⢳⡈⠻⢾⣷⠉⠒⠠⣀⠀⠀⠀⢿⣿⠀⢀⠴⠿⢿⣿⣯⣷⣿⣿⢿⣷⣿⣿⣷⡽⣿⢿⣿⣿⣿⣽⣿⣿⡇⣿⠀
⠀⠀⠀⠀⠀⢠⠞⡁⠄⠀⠙⣆⠀⡰⠃⠀⠀⡀⡼⠀⠀⠀⠙⢤⡀⠀⠀⠀⠀⠀⠉⠀⠒⠚⠃⠈⢠⣶⠀⣼⣿⣿⣿⣿⣾⣿⣿⣽⣾⣿⣷⡝⣆⠈⠛⢿⣿⣿⣿⣗⣸⡀
⠀⠀⠀⡠⠖⠾⡆⡀⠀⠀⠀⢸⠋⠀⠀⠀⣐⡤⠃⠀⠀⠀⠀⠀⠉⠲⢤⣀⠀⠀⠀⠀⠤⠄⠐⠒⣁⣤⣾⣿⣿⣿⣿⣷⣿⢿⣾⡿⣟⣿⣿⣿⠸⡆⠀⠀⠙⢿⣿⣷⢸⡇
⠀⢀⠞⡀⠁⠐⣷⠰⠀⠀⠀⠀⡄⠀⢀⠵⠋⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣠⠽⢿⡶⣶⣶⣾⣿⡟⢻⣻⣿⠿⣿⣿⣿⣿⣿⣿⣿⢿⣿⣿⣿⣿⡇⢿⠀⠀⠀⠀⠹⣿⢼⡃
⠀⢘⣆⠃⠀⠀⠘⣆⠆⠀⠀⠀⣇⠔⣯⡄⠀⠀⠀⠀⠀⠀⠀⠀⣀⣴⢋⠀⠀⠀⠙⠶⣽⣿⣿⣧⣆⡴⠋⠓⡬⡛⢿⣿⣿⣿⣿⣿⣿⣾⣿⣿⣿⢸⡄⠀⠀⠀⠀⠈⠿⠀
⡔⠁⠘⣄⠀⠀⠀⠘⡌⠄⠀⠀⣸⢠⠰⠧⡀⠀⠀⠀⢀⣠⣖⡫⣵⠣⠁⠀⠀⠀⠀⠀⠀⣿⣿⣿⣿⣷⣄⠀⠈⠊⢢⡍⠻⢿⣿⣿⣷⣿⣿⣿⣿⢘⡇⠀⠀⠀⠀⠀⠀⠀
⢧⠀⠀⠈⠂⡀⠀⠀⠈⠒⣤⠾⣡⢎⠂⢠⡗⠒⠒⠋⠅⠀⣹⣴⠇⠂⠀⠀⠀⠀⠀⢀⣾⣿⣿⣿⣿⣿⣿⡏⠀⢀⢠⠃⠀⠀⠉⢿⣿⣿⣽⣿⣿⢸⡇⠀⠀⠀⠀⠀⠀⠀
⢈⠷⣄⠀⠀⠈⠒⠤⡄⣴⣥⠶⠣⠟⢀⡞⡇⠀⠀⠀⣀⡴⠋⢹⠀⠀⠀⠀⠀⠀⢀⣾⣿⣿⣿⡿⠿⣛⡟⠀⠀⣊⡞⠀⠀⠀⠀⠀⠙⣿⣿⣿⣿⢸⡇⠀⠀⠀⠀⠀⠀⠀
⠸⡀⠀⠒⠀⠤⠤⣤⢳⣡⡏⠀⠀⢀⠾⠾⠖⠒⠚⠋⠁⠀⠀⢸⠀⠀⠀⠀⠀⣠⣿⣿⣿⣿⣻⡇⠀⠻⢦⣀⣈⣼⡳⡄⠀⠀⠀⠀⠀⠈⢿⣿⡏⣾⠁⠀⠀⠀⠀⠀⠀⠀
⠀⠉⠒⠦⠤⠤⠤⠞⠛⠶⠾⠒⠒⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⢿⣦⣀⣀⣤⣾⣿⣿⣿⢿⡟⣿⠋⢆⠀⠀⠈⠉⠉⢀⡇⠀⠀⠀⠀⠀⠀⠈⢻⣟⡟⠀⠀⠀⠀⠀⠀⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⢻⣿⣿⣿⣿⢿⣯⣿⢺⣤⣿⢦⡀⠀⠀⠰⠦⠉⢹⠦⡄⠀⠀⠀⠀⠀⠀⠀⠻⠁⠀⠀⠀⠀⠀⠀⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠘⣾⣿⣿⣿⣾⣿⣿⣿⡟⣿⡿⢄⠈⠳⠦⣤⣀⡴⠋⣱⡘⡄⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢯⣿⣿⣿⡍⢻⣿⣽⣿⣹⡇⠈⠠⠀⠀⠀⠉⢡⠊⢀⣹⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣽⣿⣿⡇⠈⢿⣿⣿⣷⡇⠀⠀⠀⠀⠀⠀⠀⢣⠊⠀⢸⠄⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⣟⣿⣿⣿⠀⠸⣿⣿⣿⣧⠀⠀⠀⠀⠀⠀⠀⢸⠀⠀⣸⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢹⣿⣿⣻⡇⠀⢹⣿⣾⣿⡇⠀⠀⠀⠀⠀⠐⠁⠃⠀⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠘⡿⣿⣿⣿⡀⠈⣿⣿⣿⣿⣤⣀⠀⠀⠀⣀⡠⠤⠚⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢷⣿⣿⢿⣇⠀⢸⣿⣿⢿⣷⢻⠉⠈⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣼⣹⣿⣿⣿⡦⠤⢿⣿⣿⣿⣧⢣⣀⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣠⠞⢡⣜⣏⣿⣿⣽⣿⣦⡽⣿⣿⢿⣿⣎⢧⡌⠉⠑⢦⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠐⡇⠀⠈⠉⠛⠛⠛⠉⡝⠁⣰⣹⣿⣿⣿⣿⣾⣿⡗⠀⠠⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣹⠒⠤⣀⠀⠀⠀⡼⡆⡀⠙⠻⠿⠿⠿⠿⠟⠋⠀⠄⡼⠧⡄⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⡀⣀⠴⢇⠀⠤⠐⠛⠂⠀⠑⡵⣤⢀⡀⠀⠀⠀⠀⠀⢀⣔⡉⠀⡀⢸⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣀⠔⣪⣑⣈⠀⠀⠈⠫⡒⠤⠤⠤⠤⣴⣶⡇⠀⠠⠵⠂⠀⠀⠀⠀⠈⠀⢐⣠⣞⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣼⣵⣾⡿⣟⣿⣻⣷⣦⣄⠀⠑⠢⡀⠀⠘⣿⣿⣦⣄⣀⣠⣤⣤⣤⠴⠒⠉⢁⣀⣈⡙⢿⡳⣤⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣴⣾⣿⣻⢾⣽⣟⡷⣟⣾⡽⣯⣧⡀⠀⠘⣄⢂⢻⣿⣟⣿⣻⢯⣟⠟⠁⠉⠉⠉⠀⠀⠀⠀⠀⠉⠳⡙⢦⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣠⣿⡿⣽⣞⣯⣿⣳⣯⢿⣻⣽⣻⣽⣻⡇⠀⢠⣇⣎⢼⣿⣿⣳⣿⣻⡟⠀⠀⠀⠀⠀⠀⠀⣀⣤⣶⣾⢿⣿⣦⣹⠀⠀⠀⠀⠀⠀⠀⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣴⡿⣯⣿⣽⢾⣻⡾⣽⢯⣿⣯⡷⠿⠷⣛⣷⣠⣃⣤⣴⣾⢯⡻⢷⣯⣿⠀⠀⠀⠀⠀⠀⢠⣾⣟⣯⣷⣟⡿⣾⡽⣿⣷⡄⠀⠀⠀⠀⠀⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢧⡛⠦⢭⣉⣉⣉⡩⠭⠭⠤⠖⠒⠛⣉⣉⣭⡾⠿⠛⠛⠛⢦⣙⠧⣍⣿⢀⠀⠀⠀⠀⢀⣿⣟⣾⣻⢾⣽⣻⢷⣿⣳⣯⣿⣆⠀⠀⠀⠀⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠓⠲⠤⠤⠤⠴⠒⠒⠒⠛⠉⠉⠁⠀⠀⠀⠀⠀⠀⠀⠀⠉⠳⢮⡙⠢⣈⠂⠄⠀⢸⣿⣞⣯⢿⣯⡷⣿⣻⣾⣽⣳⣯⣿⡄⠀⠀⠀⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠳⢤⣉⠒⠄⣿⠛⠾⢿⣻⣾⣽⢷⣟⡾⣷⣻⢷⣻⣷⠀⠀⠀⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠑⠢⢤⣉⠓⠲⠤⣉⡙⠛⠚⠛⠛⢛⣫⡵⣋⡇⠀⠀⠀⠀
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠑⠒⠤⠤⢭⣉⣉⣙⣩⡥⠶⠋⠀⠀⠀⠀⠀

• ASCII art for a little razzle dazzle if ya want
  
• When you have to resolve a conflict ANYTHING GOES

Resolving Git Merge Conflicts

Don’t Be Scared

Be Careful…

• Some of you thinking.. we used an overly easy ex
  
• 20 mins ain’t alot of time.
  
• Yall come up here and do a more complicated conflict -.-
  
• believe me..doesn’t matter how complicated, process is the same
  
• What makes the process hard or not -> little to do with Git
  
• But everything to do with how you prep and plan your work
  
• When you finally realize that, and plan accordingly, you’ll start to say things like..

Maybe This Won’t Be So Bad

• When you start to become receptive to exploring git merge conflicts
  
• You may start to realize that..

Conflicts are Not Git Problems

Merge conflicts are not Git problems

They are…

Communication Problems

Workflow Problems

Knowledge Gap Problems

• Cycle thru the frags (the below notes come after - work/proc)
  
• You can probably never completely avoid conflicts working w/ others
  
• But you can lessen the frequency and severity of them
  
• Unfortunately, I can only give the highlights of these important concepts
  
• but, Links are active and use this QR code to go to this talk’s repository
  
• Even though I have to skim by these, I hope I can plant the seed -> inspire you/team to think critically
  
• start w/ comms - ‘Good Communication’ can look like a lot of things
  
• first think of talking to people
  

Git Conflict Mitigation

Communication

• Talking with Others
• Naming/styling Conventions
• Consistent Formatting

• these will encourage explicit convos that can reduce miscomms
  
• convos allows for team to plan workflow and code review process
  
• Communicating in your code is also import!
  
• make sure everyone styling the same - sounds nitpciky??
  
• sucks having a conflict due to whitespace/formatting
  

Git Conflict Mitigation

Communication

• Leverage Developer Platforms
  • “Pull Request Templates”
  • “Labels”
  • “Issues”
  • “Pull Request Comments”
  • “Branch Rules and Protection”

• My team uses github heavily, wish I could give a whole talk on just this topic
  
• These are things that I use in my everday toolkit
  
• if you use Gh, and don’t know things or aren’t using them, Strongly encourage you to explore
  
• Next, probably the most important aspect of mitigation … addressing workflow

Git Conflict Mitigation

Workflow

Be thoughtful before, during, and after your coding sessions

• Before You Code:
  • Emergencies aren’t real 🤷🏾
  • Check Git Environment
  • Check Branch Status and “Drift”
  • ALWAYS pull first before touching ANYTHING

• Think of workflow as three parts: what you should do before, during, after:
• First off, Don’t be bullied into getting flustered for “emergencies”
  
• I feel VERY strongly about this
  
• Git Env: staged commits and/or stashes
  
• branch status: that branches are ready to be pulled
  
• branch drift: If you started a branch of master/main long time ago, chances of conflict increase - consider if easier to start anew.
  
• Probably the best way to mitigate a lot of conflicts, pulling before doing anything!

Git Conflict Mitigation

Workflow

Be thoughtful before, during, and after your coding sessions

• During Your Coding:
  • Commit Often (with repeated amends)
  • Push Thoughtfully but consider “Branch Drift” risk
  • Use git stashes when there’s ✌🏾emergencies✌🏾

• working on large tasks
  
• break it down and commit as often as you want, but use commits amendments
  
• to keep your git history clean for yourself and others
  
• and push only when it’s at a good “enough” spot to merge in
  Branch drift risk: - don’t let perfectionism hurt you, work may be good enough to be merged if documentted and annotated properly
  
• Stashes are great for unfinished work that doesn’t meet your team’s workflow standards yet
  

Git Conflict Mitigation

Workflow

Be thoughtful before, during, and after your coding sessions

• After You Code:
  • Leave nothing behind
  • You are Reviewer #1

• Big way to avoid conflicts is to leave no trace when done (pushing commits and stashing unfinished work)
  

• Before sending code to some else (review/work on), check it yourself and sleep on it if able, b/c
  

• ensure your work is clear, reproducible, and documented, so anyone could pick it up, run it, and understand it
  
  

• maybe you need to learn more about git
  

Git Conflict Mitigation

Knowledge

Learn what you need to, how you need to by (Watching, Reading, Doing, or Skimming)

Because, sometimes…
you may really just need to do more with git

• Use rstudio w/o terminal - limited in git fxs
  
• Most use cases, limitations may be fine
  
• depending work you have, you may need to do some niche thing, you know when that time comes
  
• My Reccomend -> actively seek out that info when needed, docs/resources on git are rabbit-holey and ALOT (overwhelm)
  
  So I know I this was alot
  but, My hope would be that you’d gradually improve your communication, workflows, and overall knowledge
  so you can get to a point where you see a merge conflict and say…

I Got This

Because, just like with parenting, travelling, and most difficult things in life, there’s no tried and true method to success that anyone can just follow. You’ll find plenty of resources explaining the basic concept of merge conflict resolution, but it’s a tricky thing to teach because while most conflicts are simple, all of them require some type of contextual knowledge. The only reliable method to learning how to resolve merge conflicts is through preparation, practice, and exposure.
But for those of you that have been afraid of merge conflicts, or are still afraid, I know that this.. (click)

…chaotic scene is probably what it feels like when you run into a conflict right now, but if you take the time to let the…

dust settle and regain your bearings, you and your team can start preparing to work more efficiently

And eventually, each time you run into a merge conflict…

It will be less scary, until suddenly..

…you’ll realize you don’t have to plead with git to let you merge anymore because with confidence, caution, and care, You do have the power to control the journey your work takes to get to…

…it’s destination. Thank You.