I still haven't found anything better than IntelliJ's triple column view for res... | Hacker News

Hacker Newsnew | past | comments | ask | show | jobs | submit

		SOLAR_FIELDS on Oct 23, 2017 \| parent \| context \| favorite \| on: Using Java 9 Modularization to Ship Zero-Dependenc... 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?

icebraining on Oct 23, 2017 [–]

If you don't mind having it separate from your main editor, Meld is great.

SOLAR_FIELDS on Oct 23, 2017 | [–]

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

Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact