On: Using Java 9 Modularization to Ship Zero-Dependenc...

[crispinb]

I was curious as I've never found a standalone visual git client I liked as much as IntelliJ's integrated one. So I downloaded it, found it was 1/4 of a GB and wouldn't look at a local repo without logging in to a web service. Deleted.

[SOLAR_FIELDS → crispinb]

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 → SOLAR_FIELDS]

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

[SOLAR_FIELDS → icebraining]

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

[friendzis → crispinb]

Some years ago I was evaluating GUI git clients (the landscape has changed since) for rather simple flows and found SmartGitHg simple enough to setup and explain in under an hour and powerful enough not to drop to a shell. No affiliation here.

[philliphaydon → crispinb]

It never used to require logging in but the moment they added that I deleted it.