Blog135.7K views663 votes0 replies846 following
Stop Reading Conflict Markers: Resolve Merges Visually in GitKraken
GitKraken’s visual merge conflict resolver replaces textual <<<<<<< markers with side-by-side panes and a live result, letting you resolve conflicts by clicking instead of editing markers.
gitkraken