Resolving Merge Conflicts in GitKraken: What the Visual Tool Actually Does for You
GitKraken's merge tool turns conflict markers into per-block decisions with an ours/theirs/output view. Here's what it actually does to your repo, a worked example, and when the terminal is still the better choice.