News for hackers. Stuff that matters.

A comment on Using Java 9 Modularization to Ship Zero-Dependency Native Apps. Parent comment

Re:Using Java 9 Modularization to Ship Zero-Dependency Nativ... by SOLAR_FIELDS on Monday October 23, 2017 @12:56PM (#15534636)
I still haven't found anything better than IntelliJ's triple column view for resolving merge conflicts. Is there anything similar in a more lightweight editor?
[ Parent | on HN ]
Re:Using Java 9 Modularization to Ship Zero-Dependency Nativ... by icebraining on Monday October 23, 2017 @01:10PM (#15534760)
If you don't mind having it separate from your main editor, Meld is great.
[ Parent | on HN ]
Re:Using Java 9 Modularization to Ship Zero-Dependency Nativ... by SOLAR_FIELDS on Monday October 23, 2017 @04:05PM (#15536506)
Interesting that this is touted as one of the "best" uses of Meld[0]. Will try this out tomorrow.

0: http://meldmerge.org/help/resolving-conflicts.html

[ Parent | on HN ]