• Home
  • Now
  • RSS

HPSHELTON

Programming, Privacy, Politics, Photography

Mar 6, 2015

Fix Conflicts Only Once With Git Rerere →

So you fixed a conflict somewhere in your repo, then later stumbled on exactly the same one (perhaps you did another merge, or ended up rebasing instead, or cherry-picked the faulty commit elsewhere…). And bang, you had to fix that same conflict again.

That sucks.

Especially when Git is so nice that it offers a mechanism to spare you that chore, at least most of the time: rerere. OK, so the name is lousy, but it actually stands for Reuse Recorded Resolution, you know.

In this article, we'll try and dive into how it works, what its limits are, and how to best benefit from it.

I think I just reached a new level of git-foo. This makes me feel like I just learned how to use rebase correctly again.

Older →

← Newer

 

Links

  • RSS
  • GitHub
  • Liked Posts
  • LinkedIn

H. Parker Shelton

I'm just an ordinary thirty-something who's had some extraordinary opportunities. I graduated from Johns Hopkins University, work for Microsoft in Silicon Valley, code websites and applications, take the occasional photograph, and keep a constant eye on current events, politics, and technology. This blog is the best of what catches that eye.

 
  • © 2010 – Present, H. Parker Shelton (Except Where Noted)
  • Hosted by GitHub Pages
  • Design by Ian P. Hines