News for hackers. Stuff that matters.
Re:Resolve simple merge conflicts on GitHub by bjeanes on Monday December 12, 2016 @06:01PM (#13162874)
Agreed.

It can be a bit noisier at first but once you learn to read it, I find it makes resolving conflicts so much easier.

For those of you who haven't used it, try switching it on and/or read https://psung.blogspot.com.au/2011/02/reducing-merge-headach... for more details.

tl;dr it shows

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