News for hackers. Stuff that matters.

A comment on The largest Git repo. Parent comment

Re:The largest Git repo by deepsun on Wednesday May 24, 2017 @05:46PM (#14413724)
IntelliJ IDEA default merger knows when all conflicts in a file are handled and shows you a handy notification on top "Save changes and finish merging".
[ Parent | on HN ]
Re:The largest Git repo by mandeepj on Friday May 26, 2017 @03:50PM (#14426664)
TFS's conflict resolver also does this
[ Parent | on HN ]