Git In-depth Git In-depth

Merging and ReReRe Exercise

Check out a free preview of the full Git In-depth course:
The "Merging and ReReRe Exercise" Lesson is part of the full, Git In-depth course featured in this preview video. Here's what you'd learn in this lesson:

In this exercise, students look at fast-forward merge, learn how to make a non-fast-forward merge, then learn how to use git's Reuse Recorded Resolution (ReReRe) functionality to automate complex merges. - https://github.com/nnja/advanced-git/blob/master/exercises/Exercise4-MergingAndReReRe.md

Get Unlimited Access Now

Transcript from the "Merging and ReReRe Exercise" Lesson

[00:00:00]
>> Nina Zakharenko: Let's do an excercise and check out Merging and Git ReReRe.
>> Speaker 2: David's asking is there any dangers of using ReReRe?
>> Nina Zakharenko: Git does a pretty good job of matching conflict resolutions. I personally perfer to turn it on on a per project basis. One of those things I don't like having on globally, I like knowing that it's on, and it's not on by default.

[00:00:33] If necessary, if something goes wrong, if you mess up the resolution, GIT allows you to delete those saved resolutions, and try again.