3 ms·

I'll give it a shot next time I have conflicts, thanks.

• cryptonector 7y ago
  You're welcome. Leave a comment on the gist about how it goes, if you remember! I'd really like git to have this feature built-in to it...