ReadMeFeed / Community knowledge
Real questions. Useful conversations. Find the people who know your stack.
Use GitKraken’s visual conflict editor to resolve merge or rebase conflicts, commit cleanly, and verify the result with git status, log, and diff checks. Follow the step‑by‑step guide to keep your history tidy.
When a merge conflict pops up, GitKraken turns the headache into a side‑by‑side diff, inline actions, and a single merge commit. This guide shows how the feature works, a concrete example, and when it’s best to rely on the tool.
Learn how Towergit’s built‑in conflict resolver shows BASE, LOCAL, and REMOTE panes, lets you edit the RESULT inline, and stages resolved files so you can finish a merge or rebase without leaving the GUI.
Decide which merge conflict resolver to use in GitKraken—built‑in, external GUI, or terminal—by weighing UI convenience, performance, and CI integration. Follow the step‑by‑step guide to configure, test, and validate your choice.
GitKraken’s built‑in three‑way merge editor lets you resolve conflicts in a single, visual window. Follow a step‑by‑step demo, see how it updates staging in real time, and learn when it works best and when you might need a fallback.
Stop hunting for conflict markers. Learn how Towergit's three-pane visual resolver lets you pick, edit, and commit merge resolutions efficiently on macOS.
Learn how to use GitKraken’s visual merge conflict editor to quickly resolve conflicts during merges or rebases, with step‑by‑step instructions, verification checks, and rollback options.
SourceTree utilizes a proprietary interface for resolving Git merge conflicts, allowing users to select 'Mine' or 'Theirs' versions for individual files. When processing a commit tree containing hundreds of conflicted files, the application attempts to refresh the status of each item simultaneously within the UI. There is a documented inconsistency regarding
gitkraken
git
towergit