From 2906689a299e500740f026f59938c08635e1996f Mon Sep 17 00:00:00 2001
From: Samuel O'Neal <me@samoneal.io>
Date: Thu, 10 Sep 2026 11:16:43 -0600
Subject: [PATCH] fix: remap unclash.nvim to conflict-free bindings

Avoid overlapping LSP/diffview keymaps on a new Git > Conflict
(<leader>gx*) group. Navigation stays on ]x/[x.
---
 lua/plugins/editor.lua |  1 +
 lua/plugins/git.lua    | 30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/lua/plugins/editor.lua b/lua/plugins/editor.lua
index 7392c8f..327ddb4 100644
--- a/lua/plugins/editor.lua
+++ b/lua/plugins/editor.lua
@@ -82,6 +82,7 @@ return {
         { "<leader>D", group = "Database" },
         { "<leader>f", group = "Find" },
         { "<leader>g", group = "Git" },
+        { "<leader>gx", group = "Conflict" },
         { "<leader>o", group = "Overseer" },
         { "<leader>s", group = "Search / Symbols" },
         { "<leader>t", group = "Test" },
diff --git a/lua/plugins/git.lua b/lua/plugins/git.lua
index 58f6367..d924fdb 100644
--- a/lua/plugins/git.lua
+++ b/lua/plugins/git.lua
@@ -39,39 +39,39 @@ return {
         desc = "Prev Conflict",
       },
       {
-        "<leader>co",
-        function()
-          require("unclash").open_merge_editor()
-        end,
-        desc = "Open Merge Editor",
-      },
-      {
-        "<leader>cc",
+        "<leader>gxc",
         function()
           require("unclash").accept_current()
         end,
-        desc = "Accept Current",
+        desc = "Accept Current (Conflict)",
       },
       {
-        "<leader>ci",
+        "<leader>gxi",
         function()
           require("unclash").accept_incoming()
         end,
-        desc = "Accept Incoming",
+        desc = "Accept Incoming (Conflict)",
       },
       {
-        "<leader>cb",
+        "<leader>gxb",
         function()
           require("unclash").accept_both()
         end,
-        desc = "Accept Both",
+        desc = "Accept Both (Conflict)",
       },
       {
-        "<leader>fx",
+        "<leader>gxm",
+        function()
+          require("unclash").open_merge_editor()
+        end,
+        desc = "Open Merge Editor (Conflict)",
+      },
+      {
+        "<leader>gxp",
         function()
           require("unclash.snacks").pick()
         end,
-        desc = "Pick Conflicts",
+        desc = "Pick Conflicts (Snacks)",
       },
     },
   },