3 ms·
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?
by SOLAR_FIELDS 9y ago
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 9y agoIf you don't mind having it separate from your main editor, Meld is great.
- SOLAR_FIELDS 9y agoInteresting 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 http://meldmerge.org/help/resolving-conflicts.html