Improve vim conflict resolution

2025-09-09 14:11:07 +01:00 · 2025-09-09 14:11:07 +01:00 · a78805ebcc
commit a78805ebcc
parent 79e82f8c6a
2 changed files with 30 additions and 0 deletions
--- a/home/dot_config/nvim/lua/plugins/conflict-markers.lua
+++ b/home/dot_config/nvim/lua/plugins/conflict-markers.lua
@ -0,0 +1,26 @@
+return {
+  "akinsho/git-conflict.nvim",
+  lazy = false,
+  opts = {
+    default_mappings = {
+      ours = "<leader>ho",
+      theirs = "<leader>ht",
+      none = "<leader>h0",
+      both = "<leader>hb",
+      next = "]x",
+      prev = "[x",
+    },
+  },
+  keys = {
+    {
+      "<leader>gx",
+      "<cmd>GitConflictListQf<cr>",
+      desc = "List Conflicts",
+    },
+    {
+      "<leader>gr",
+      "<cmd>GitConflictRefresh<cr>",
+      desc = "Refresh Conflicts",
+    },
+  },
+}