News for hackers. Stuff that matters.
Re:Resolve simple merge conflicts on GitHub by dabber on Monday December 12, 2016 @06:43PM (#13163183)
That's great, thanks for sharing.

FYI: If anyone is interested in the section about git rerere (reuse recorded resolution), the link at the bottom of that article leads to a 503; a repost can be found here: https://git-scm.com/2010/03/08/rerere.html

There are no comments on this comment yet.