From b2e46820c04107fef122ff63da3344376b2d8e9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20La=C3=ADn?= <sergio.lac@pm.me>
Date: Sat, 7 Sep 2024 00:47:17 +0200
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor(nvim):=20git-conf?=
 =?UTF-8?q?lict=20extra?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extras/editor/git/git-conflict.lua        | 35 ++++++++++++++-----
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/.config/nvim/lua/plugins/extras/editor/git/git-conflict.lua b/.config/nvim/lua/plugins/extras/editor/git/git-conflict.lua
index 62d9f67c..d554c00c 100644
--- a/.config/nvim/lua/plugins/extras/editor/git/git-conflict.lua
+++ b/.config/nvim/lua/plugins/extras/editor/git/git-conflict.lua
@@ -1,20 +1,37 @@
 local prefix = "<leader>gC"
 
+vim.api.nvim_create_autocmd("User", {
+  pattern = "GitConflictDetected",
+  callback = function()
+    vim.notify("Conflict detected in " .. vim.fn.expand("<afile>"))
+  end,
+})
+
 return {
   {
     "akinsho/git-conflict.nvim",
     opts = {
-      default_mappings = false,
+      default_mappings = {
+        ours = prefix .. "o",
+        theirs = prefix .. "t",
+        none = prefix .. "n",
+        both = prefix .. "b",
+      },
+    },
+    cmd = {
+      "GitConflictChooseTheirs",
+      "GitConflictChooseOurs",
+      "GitConflictChooseBoth",
+      "GitConflictListQf",
+      "GitConflictRefresh",
+      "GitConflictNextConflict",
+      "GitConflictPrevConflict",
     },
-    version = "v1.0.0",
-    cmd = { "GitConflictChooseTheirs", "GitConflictChooseOurs", "GitConflictChooseBoth", "GitConflictListQf" },
     keys = {
-      { prefix .. "t", "<cmd>GitConflictChooseTheirs<cr>", desc = "Choose Their Changes" },
-      { prefix .. "o", "<cmd>GitConflictChooseOurs<cr>", desc = "Choose Our Changes" },
-      { prefix .. "b", "<cmd>GitConflictChooseBoth<cr>", desc = "Choose Both changes" },
-      { prefix .. "l", "<cmd>GitConflictListQf<cr>", desc = "Git Conflict Quicklist" },
-      { "[g", "<cmd>GitConflictPrevConflict<cr>", desc = "Prev Git Conflict" },
-      { "]g", "<cmd>GitConflictPrevConflict<cr>", desc = "Next Git Conflict" },
+      { "]g", "<cmd>GitConflictNextConflict<cr>", desc = "Next Conflict" },
+      { "[g", "<cmd>GitConflictPrevConflict<cr>", desc = "Previous Conflict" },
+      { prefix .. "l", "<cmd>GitConflictListQf<cr>", desc = "List Conflicts" },
+      { prefix .. "r", "<cmd>GitConflictRefresh<cr>", desc = "Refresh Conflicts" },
     },
   },
   {