Git In-depth

Merging and ReReRe Exercise

Git In-depth

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.


Transcript from the "Merging and ReReRe Exercise" Lesson

>> 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.

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

Learn Straight from the Experts Who Shape the Modern Web

  • In-depth Courses
  • Industry Leading Experts
  • Learning Paths
  • Live Interactive Workshops
Get Unlimited Access Now