Diagnosing GitKraken Merge Conflict Editor Failures When the Resolve Button Is Disabled
Learn why GitKraken may hide its conflict editor and how to restore it by checking Git executable paths, merge tool settings, and file permissions.
ReadMeFeed / Community knowledge
Real questions. Useful conversations. Find the people who know your stack.
Learn why GitKraken may hide its conflict editor and how to restore it by checking Git executable paths, merge tool settings, and file permissions.
Configuration state after mid-write failure TortoiseGit stores user-level settings in %USERPROFILE%\.gitconfig and supplements them with UI-specific data under %APPDATA%\TortoiseGit . The installer writes to these locations during upgrade, but the MSI transaction does not treat the text-based .gitconfig as a rollback-capable resource. Observed gap When an up
Configuration scope after the Git Binary transition GitKraken ships an embedded Git binary so that behavior stays consistent across platforms, and its preferences expose a Git Binary selector that lets that embedded engine be replaced with a locally installed system Git. The transition is not purely cosmetic: the two engines can resolve global configuration