Git Labs· Module 6 — Investigate Production HistoryLab 35 of 36

Reuse Conflict Resolution with git rerere

The rate-limit feature must land on release/1.1 and on main, and both conflict the same way. Resolve it once, let Git reuse your resolution, and publish both branches.

  • Advanced
  • 25 min
  • Not rated yet
  • Free
Start labPart of Git hands-on labs

Free with a free account — it runs in your browser, nothing to install.

  • A real environment in your browser
  • You run the commands yourself
  • Your result is checked automatically

In this moduleModule 6 — Investigate Production History

  1. Search History with grep, log -S and log -G25 min
  2. Investigate a Line with git blame25 min
  3. Find a Regression with git bisect30 min
  4. Reuse Conflict Resolution with git rerereYou are here