-
Notifications
You must be signed in to change notification settings - Fork 2
/
Copy pathplease_let_me_merge.qmd
1354 lines (948 loc) · 43.7 KB
/
please_let_me_merge.qmd
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
---
title: "Please Let Me Merge Before I Start Crying"
subtitle: "And Other Things I've Said At The Git Terminal"
date: 2024-08-13
institute: ""
date-format: " "
format:
revealjs:
slide-number: false
width: 1690
height: 1080
margin: .2
editor: source
linkcolor: "#048781"
highlight-style: github
code-copy: true
code-overflow: scroll
code-block-bg: true
transition: fade
code-block-height: 1000px
css: "scripts/style.css"
title-slide-attributes:
data-background-image: "images/title.gif"
data-background-size: "contain"
data-background-position: "center"
data-background-color: "#1a1a1a"
data-notes: "As I've grown into my role as a Data Scientist, **I've said..**"
transition: fade
---
## I Can't Do This {.section-header background-image="images/1.png" background-size="contain" background-color="#1a1a1a"}
::: notes
... 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 {.section-header background-image="images/first_curve.png" background-size="contain" background-color="#1a1a1a"}
::: notes
You have the initial challenge of just learning to use Git, **but then you have the..**
:::
## Git's Second Learning Curve {.section-header background-image="images/second_curve.png" background-size="contain" background-color="#1a1a1a"}
::: notes
..the additional mountain to climb when learning how to handle merges and conflicts so you can use it collaboratively. <br>
This talk today is geared towards those of you who may feel that you're
:::
## Git's Second Learning Curve {.section-header background-image="images/middle_curve.png" background-size="contain" background-color="#1a1a1a"}
::: notes
Right here in the middle.<br>
Maybe, you've figured out the basics of Git and have<br>
have even done a few merges already<br>
but might be a little hesitant like I once was to even deal with merge conflicts.<br>
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 {.section-header background-image="images/git_driving.png" background-size="contain" background-color="#1a1a1a"}
::: notes
Driving.. So let me give an example<br> Last spring, I took a long road trip that I've done many times.<br> 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. <br> For me, this scenario was similar to my experiences \***using git collaboratively...**
:::
## Long Road Trips Require Planning {.section-header background-image="images/prep_1.png" background-size="contain" background-color="#1a1a1a"}
::: notes
..Just like I make compulsive packing lists **before my road trips...**
:::
## Collaborating With Git Requires Planning {.section-header background-image="images/prep_2.png" background-size="contain" background-color="#1a1a1a"}
::: notes
...I also make compulsive task lists to prepare myself for Git merges.
:::
## Road Trips are a Journey from Point A to Point B {.section-header background-image="images/travel_1.png" background-size="contain" background-color="#1a1a1a"}
::: notes
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 {.section-header background-image="images/travel_2.png" background-size="contain" background-color="#1a1a1a"}
::: notes
..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 {.section-header background-image="images/support_1.png" background-size="contain" background-color="#1a1a1a"}
::: notes
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 {.section-header background-image="images/support_2.png" background-size="contain" background-color="#1a1a1a"}
::: notes
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 {.section-header background-image="images/git_1.png" background-size="contain" background-color="#1a1a1a"}
::: notes
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 {.section-header background-image="images/git_2.png" background-size="contain" background-color="#1a1a1a"}
::: notes
...felt like Git wanting to help me with my code, but actually creating more work for justified reasons.<br><br>
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.
<br><br>
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 {.section-header background-image="images/2.png" background-size="contain" background-color="#1a1a1a"}
::: notes
These phrases stem from desperation and frustration <br>
Because we don't understand<br>
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 {.content-header background-image="images/content_back_long.png" background-size="contain" background-color="#1a1a1a"}
::: content
- Git ≠ GitHub
- Git: Version Control System
- GitHub: Developer Platform that uses Git Software
:::{.fragment}
- 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](https://desktop.github.com/download/))
:::
:::
:::{.notes}
- not interchangeable<br>
- Briefly - touch on - GH personal workflow later..<br>
- SAY definitions<br>
- the fact that alot of people mix these words up is proof that<br>
- reliable ways to interact with git<br>
- Which for R Users are (click)<br>
- Command line interface
:::
## Do Whatever You want {.section-header background-image="images/dwyw.png" background-size="contain" background-color="#1a1a1a"}
:::{.notes}
- Github isn't the only platform
<br>
- DS card revoked - for Not using the terminal
<br>
- But just do what makes sense for your skills & sitch
<br>
Let's talk about the git merge.
:::
## What is a Git Merge? {.content-header background-image="images/content_back.png" background-size="contain" background-color="#1a1a1a"}
::: columns
::: {.column width="50%"}
<br><br>
"Join two or more development histories *(Branches)* together"
<br><br>
<small>[Git Merge Docs](https://git-scm.com/docs/git-merge) *("Git - git-merge Documentation")*</small>
:::
::: {.column width="50%"}
:::
:::
:::{.notes}
- Merges come in different flavors
<br>
- Usually via pushes
<br>
- when pushing new work up...and
<br>
:::
## What is a Git Merge? {.content-header background-image="images/content_back.png" background-size="contain" background-color="#1a1a1a"}
::: columns
::: {.column width="50%"}
<br><br>
"Join two or more development histories *(Branches)* together"
<br><br>
<small>[Git Merge Docs](https://git-scm.com/docs/git-merge) *("Git - git-merge Documentation")*</small>
:::
::: {.column width="50%"}
:::
:::
:::{.notes}
- pulls when pulling new work down<br>
- No matter the type, Merges -> important
- b/c allow for us to safely modify work when collaborating w/ others<br>
- That's all a merge is... so seems simple enough...<br>
- why scary?
:::
## Why is a Git Merge Scary? {.content-header background-image="images/content_back.png" background-size="contain" background-color="#1a1a1a"}
::: columns
::: {.column width="50%"}
:::
::: {.column width="50%"}
:::
:::
## Why is a Git Merge Scary? {.content-header background-image="images/content_back.png" background-size="contain" background-color="#1a1a1a"}
::: columns
::: {.column width="50%"}
<br><br><br>
<large>It's Not...</large>
:::
::: {.column width="50%"}
:::
:::
## Why is a Git Merge Scary? {.content-header background-image="images/content_back.png" background-size="contain" background-color="#1a1a1a"}
::: columns
::: {.column width="50%"}
<br><br><br>
It's Not...
...No really
:::
::: {.column width="50%"}
:::
:::
:::{.notes}
If scared of merges, might I suggest.. **scared of conflicts?**
:::
## People are afraid of git merge conflicts {.section-header background-image="images/conflict.png" background-size="contain" background-color="#1a1a1a"}
::: {.notes}
- if so? that's ok. judgment-free zone
<br>
- I believe to start conquering fears
<br>
- Learn about what you're dealing with
<br>
- So let's take a moment to understand them
:::
## What is a Git Merge Conflict? {.content-header background-image="images/content_back.png" background-size="contain" background-color="#1a1a1a"}
<br><br>
::: columns
::: {.column width="50%"}
“Competing changes are made to the same line of a file"
:::
::: {.column width="50%"}
:::
:::
<br><br>
<small>- [GitHub Docs](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line) *("Resolving a merge conflict using the command line")*</small>
::: {.notes}
- Occurs in..
:::
## What is a Git Merge Conflict? {.content-header background-image="images/content_back.png" background-size="contain" background-color="#1a1a1a"}
<br><br>
::: columns
::: {.column width="50%"}
“Competing changes are made to the same line of a file"
:::
::: {.column width="50%"}
"When someone edits a file and someone else deletes the same file.”
:::
:::
<br><br>
<small>- [GitHub Docs](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line) *("Resolving a merge conflict using the command line")*</small>
::: {.notes}
-To further contextualize
- Only 2
:::
## What is a Git Merge Conflict? {.content-header background-image="images/content_back.png" background-size="contain" background-color="#1a1a1a"}
<br><br>
::: columns
::: {.column width="50%"}
<center>
<span style="color:#063e9e;"><u>Content</u></span>
<br><br>
“<span style="color:#063e9e;">Competing changes</span> are made to the same <span style="color:#063e9e;">line of a file.</span>"
</center>
:::
::: {.column width="50%"}
:::
:::
:::{.notes}
- conflict in Actual content (lines of code)
:::
## What is a Git Merge Conflict? {.content-header background-image="images/content_back.png" background-size="contain" background-color="#1a1a1a"}
<br><br>
::: columns
::: {.column width="50%"}
<center>
<span style="color:#063e9e;"><u>Content</u></span>
<br><br>
“<span style="color:#063e9e;">Competing changes</span> are made to the same <span style="color:#063e9e;">line of a file.</span>"
</center>
:::
::: {.column width="50%"}
<center>
<span style="color:#801423;"><u>Structure</u></span>
<br><br>
"When someone <span style="color:#801423;">edits a file</span> and someone else <span style="color:#801423;">deletes the same file</span>.”
</center>
:::
:::
::: {.notes}
- conflicts w/ Modification/Deletion of folder itself<br>
- doesn't seem to scary at first glance<br>
- But, there has to be a reason people are afraid of merge conflicts<br>
- 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 {.section-header background-image="images/conflict_vis_1.png" background-size="contain" background-color="#1a1a1a"}
::: {.notes}
So what had happened was:
<br>
two coworkers created local branches off master
<br>
all repos have a simple text config file with data cut dates in them
<br>
when started -> same vs of config file
:::
## Simple Merge Conflict Example {.section-header background-image="images/conflict_vis_2.png" background-size="contain" background-color="#1a1a1a"}
::: {.notes}
- coworker 1 finishes<br>
- changed config file to go w/ work<br>
- pushes/merge np<br>
- meanwhile cw 2 in iteration hell w/ the orig vs.
:::
## Simple Merge Conflict Example {.section-header background-image="images/conflict_vis_3.png" background-size="contain" background-color="#1a1a1a"}
::: {.notes}
when Cw2 finished, had to update config file<br>
THEIR version of the config file is different<br>
Now they have a merge conflict <br>
So, ok. we have the scenario, let's see what this conflict looks like in the code
:::
## Simple Merge Conflict Example {.content-header background-image="images/content_back.png" background-size="contain" background-color="#1a1a1a"}
::: content
:::
:::{.notes}
- Both versions<br> (Repository and CoWorker # 2s)
- Content conflict - line 5 - > diff dates<br>
- so, when cw #2 attempted to merge, the resulting **conflict looked like...**
:::
## Simple Merge Conflict Example {.content-header background-image="images/content_back.png" background-size="contain" background-color="#1a1a1a"}
```yaml
#=============================#
# 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"
```
::: {.notes}
If this is giving you anxiety, it's ok<br>
may help w/ anxiety -> every conflict<br>
3 components - no matter how complex
:::
## Simple Merge Conflict Example {.content-header background-image="images/content_back.png" background-size="contain" background-color="#1a1a1a"}
```yaml
#=============================#
# Data Cut Dates---------------
#=============================#
<<<<<<< HEAD
main_data_cut: "2024-06-01"
```
::: {.notes}
Top of conflict is usually the branch/commit YOU are on and trying to merge<br>
Youll see conflict marker- "less-than" signs (start of conflict)<br>
Then conflicted code on your branch
:::
## Simple Merge Conflict Example {.content-header background-image="images/content_back.png" background-size="contain" background-color="#1a1a1a"}
```yaml
#=============================#
# Data Cut Dates---------------
#=============================#
<<<<<<< HEAD
main_data_cut: "2024-06-01"
=======
```
::: {.notes}
- conflict divider (equal) which separates Your version of code..
:::
## Simple Merge Conflict Example {.content-header background-image="images/content_back.png" background-size="contain" background-color="#1a1a1a"}
```yaml
#=============================#
# Data Cut Dates---------------
#=============================#
<<<<<<< HEAD
main_data_cut: "2024-06-01"
=======
main_data_cut: "2024-01-01"
>>>>>>> master
```
::: {.notes}
- From the version you are trying to merge into
<br>
- This case, master repository
<br>
last conflict marker (greater-than) signs -> end
:::
## Simple Merge Conflict Example {.content-header background-image="images/content_back.png" background-size="contain" background-color="#1a1a1a"}
```yaml
#=============================#
# 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"
```
::: {.notes}
- Everything after that is code that is not conflicted, same of both vs, so left alone
<br>
So now that we know:
<br>- what happened and what the conflict looked like
<br> - how to resolve?
<br>- Well, when coworker # 2 came to me and asked me that
<br> I asked them...
<br> -their response was - **next slide...**
:::
## Oh {.section-header background-image="images/3.png" background-size="contain" background-color="#1a1a1a"}
::: {.notes}
- 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 {.content-header background-image="images/content_back.png" background-size="contain" background-color="#1a1a1a"}
::: columns
::: {.column width="50%"}
<br><br><br>
<span id="callout">
1. Don't Panic
</span>
:::
::: {.column width="50%"}
<center>
{width=100%}
</center>
:::
:::
:::{.notes}
Easier said than done<br>
biggest reason to **not panic is...**
:::
## Resolving Git Merge Conflicts {.content-header background-image="images/content_back.png" background-size="contain" background-color="#1a1a1a"}
::: content
<span id="midcallout">
1. Don't Panic
</span>
::: columns
::: {.column width="50%"}
- Usually, conflicts aren't a big deal
:::{.incremental}
- You are (hopefully) the expert
- Walk away if you need to...
:::
:::
::: {.column width="50%"}
{width=100%}
:::
:::
:::
:::{.notes}
- have to remember -> you are XPT
- in that ex.. I had to ask which date<br>
- cw2 was expert and knew the answer...<br>
- Now, some ppl may panic b/c -> realize they can't do anything w/ git when conflict<br>
- so if not ready or calm you can (click)...<br>
- If rstudio use like myself.. 2 ways to "tuck and roll"
:::
## Resolving Git Merge Conflicts {.content-header background-image="images/content_back.png" background-size="contain" background-color="#1a1a1a"}
::: content
::: columns
::: {.column width="50%"}
<br><br>
`git merge --abort`
:::
::: {.column width="50%"}
{width=120% height=100%}
:::
:::
:::
:::{.notes}
- Rstudio -> no pretty icons for aborting merge<br>
- in rstudio tab or outside of it<br>
- type it directly<br>
- time machine<br>
- saved work - safe
:::
## Resolving Git Merge Conflicts {.content-header background-image="images/content_back.png" background-size="contain" background-color="#1a1a1a"}
::: content
::: columns
::: {.column width="50%"}
<br>
Have a Third Party handle it...
:::
::: {.column width="50%"}
{width=120% height=100%}
:::
:::
:::
:::{.notes}
- i.e: switch to ghd, to project repo -> pop-up and click<br>
- when ready to tackle, **2nd thing to do is..**
:::
## Resolving Git Merge Conflicts {.content-header background-image="images/content_back.png" background-size="contain" background-color="#1a1a1a"}
::: columns
::: {.column width="50%"}
<br><br><br>
<span id="callout">
2. Assess the Damage
</span>
:::
::: {.column width="50%"}
{width=100%}
:::
:::
:::{.notes}
- like i said, most aren't bad - could be simple.
:::
## Resolving Git Merge Conflicts {.content-header background-image="images/content_back.png" background-size="contain" background-color="#1a1a1a"}
::: content
<span id="midcallout">
2. Assess the Damage
</span>
::: columns
::: {.column width="50%"}
- You can use the terminal via `git status`
:::
::: {.column width="50%"}
{width=100%}
:::
:::
:::
:::{.notes}
git will usually tell you in the terminal what the problem is<br>
but `git status` works too
:::
## Resolving Git Merge Conflicts {.content-header background-image="images/content_back.png" background-size="contain" background-color="#1a1a1a"}
::: content
<span id="midcallout">
2. Assess the Damage
</span>
::: columns
::: {.column width="50%"}
- You can use the terminal via `git status`
- You can use the RStudio GUI
:::
::: {.column width="50%"}
{width=90%}
:::
:::
:::
:::{.notes}
- Rstudio git pane - status icons<br>
- **each icon means...**
:::
## Resolving Git Merge Conflicts {.content-header background-image="images/content_back.png" background-size="contain" background-color="#1a1a1a"}
::: content
<span id="midcallout">
2. Assess the Damage
</span>
::: columns
::: {.column width="50%"}
- You can use the terminal via `git status`
- You can use the RStudio GUI
:::
::: {.column width="50%"}
{width=50%}
:::
:::
:::
:::{.notes}
- One you want to **look for is...**
:::
## Resolving Git Merge Conflicts {.content-header background-image="images/content_back.png" background-size="contain" background-color="#1a1a1a"}
::: content
<span id="midcallout">
2. Assess the Damage
</span>
::: columns
::: {.column width="50%"}
- You can use the terminal via `git status`
- You can use the RStudio GUI
:::
::: {.column width="50%"}
{width=50%}
:::
:::
:::
:::{.notes}
quickly tells you
:::
## Resolving Git Merge Conflicts {.content-header background-image="images/content_back.png" background-size="contain" background-color="#1a1a1a"}
::: content
<span id="midcallout">
2. Assess the Damage
</span>
::: columns
::: {.column width="50%"}
- You can use the terminal via `git status`
- You can use the RStudio GUI
- You can use a Third Party
:::
::: {.column width="50%"}
{width=100%}
:::
:::
:::
:::{.notes}
- Want even more interaction - use a third party<br>
- if you're lucky... **you can even use**
:::
## Resolving Git Merge Conflicts {.content-header background-image="images/content_back.png" background-size="contain" background-color="#1a1a1a"}
::: content
<span id="midcallout">
2. Assess the Damage
</span>
::: columns
::: {.column width="50%"}
- 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)
:::
::: {.column width="50%"}
{width=100%}
:::
:::
:::
:::{.notes}
- Trying to merge on platform via PR<br>
- instead of seeing "merge", may see this<br>
- conflict is simple enough to resolve on platform
:::
## Resolving Git Merge Conflicts {.content-header background-image="images/content_back.png" background-size="contain" background-color="#1a1a1a"}
::: columns
::: {.column width="50%"}
<br><br><br>
<span id="callout">
3. Choose Your Own Adventure
</span>
:::
::: {.column width="50%"}
{width=100%}
:::
:::
:::{.notes}
what do I mean? let's think back to ex...
:::
## Resolving Git Merge Conflicts {.content-header background-image="images/content_back.png" background-size="contain" background-color="#1a1a1a"}
```yaml
#=============================#
# 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"
```
:::{.notes}
- When I asked cw 2 which date<br>
- important concept didn't realize<br>
- git was smart enough -> conflict
- but not smart enough to know how to resolve
:::
## Resolving Git Merge Conflicts {.content-header background-image="images/content_back.png" background-size="contain" background-color="#1a1a1a"}
::: content
::: columns
::: {.column width="50%"}
<br>
- You are in control!
- You can choose your code
- Or "their" code...
:::
::: {.column width="50%"}
{width=80%}
:::
:::
:::
:::{.notes}
- 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<br>
- what git was expecting of me ...<br>
- Like, literally How??<br>
- manually edit the file<br>
- let's look at ex of what git expects you to do..
:::
## Resolving Git Merge Conflicts {.content-header background-image="images/content_back.png" background-size="contain" background-color="#1a1a1a"}
::: content
{width=100%}
:::
:::{.notes}
- ~narrate what's happening here~<br>
- never realized this is what git wanted<br>
- the situation here is primitive...
- because git is relying on you to tell it what needs to move forward..
:::
## Resolving Git Merge Conflicts {.content-header background-image="images/content_back.png" background-size="contain" background-color="#1a1a1a"}
::: content