GitKraken's Built-In Merge Conflict Editor: What It Does and What to Verify
GitKraken's built-in conflict editor shows base, current, and incoming versions side by side with an editable output pane. Here's how it works, how to verify the setting on your install, and where it stops helping.