Start by seeing exactly where the Git operation broke down. GitKraken Desktop surfaces conflicted files in the Commit Panel and keeps the surrounding branch and commit context visible in the Commit Graph, whether the conflict came from a merge, rebase, cherry-pick, or stash. Confirm which files are affected and which changes are coming together before editing anything. If Conflict Prevention flagged overlapping work earlier, use that context to understand how the collision developed. The first step is understanding the scope of the conflict so you can resolve it without losing the intent behind either side.

Open a conflicted file from the Commit Panel to launch GitKraken Desktop’s Merge Tool. See the current changes on one side, the incoming changes on the other, and the resulting output below. Compare both sides with the surrounding code before deciding what should survive. Use the Commit Graph and file history when you need more context about where a change came from, and move through each conflict hunk to separate simple line collisions from changes with competing intent. You are not just removing conflict markers. You are deciding how the two changes should come together.

Once you understand the competing changes, use Auto-resolve with AI to generate a context-aware starting point. GitKraken AI proposes resolved code in the Output panel and provides an explanation and confidence level for each conflicted hunk. Review lower-confidence suggestions more closely, then accept, edit, or discard the proposed result as needed. You can also add custom conflict-resolution instructions under Preferences > GitKraken AI > Conflict Resolution to better match your project and team conventions. AI handles more of the mechanical reconciliation while you stay in control of the final result.

Before marking the conflict resolved, review the combined output against both the current and incoming changes. Use the Merge Tool to confirm that the intended behavior from each side is still present and that nothing was dropped, duplicated, or combined incorrectly. GitKraken AI’s explanations and confidence levels can help focus attention on the places that deserve a closer look, while the Output panel remains fully editable when you need to make the final adjustment yourself. The conflict is ready to move forward when the resulting file reflects the intended behavior and no unresolved conflict markers remain.

Once a conflicted file is reviewed, click Save. GitKraken writes the output and stages the file as resolved. Repeat for any remaining conflicted files. For a merge, complete the merge commit. For a rebase, stage the resolved changes and choose Continue Rebase, resolving any additional conflicts until the sequence finishes. Follow the corresponding continue flow for cherry-picks or stashes. When the operation completes, confirm the Commit Graph and working directory reflect the result you expected.

You’ve identified where the Git operation broke down, compared the competing changes, reviewed an AI-assisted resolution, and completed the integration. GitKraken Desktop gives you a visual, repeatable path through that process, while GitLens can also help you resolve conflicts directly in the IDE with the surrounding Git and code context close at hand. The goal is not just to clear conflict markers. It’s to preserve the intent behind both sides, complete the Git operation with confidence, and keep the work moving forward.