cargdev/lua-nvim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: adding git conflicts

Browse Source
This commit is contained in:
cg8936
2025-05-16 12:09:14 -04:00
parent 7dbe22cd67
commit 8d2824b0a4
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lua/cargdev/core/keymaps.lua
View File

@@ -77,3 +77,12 @@ keymap.set("v", "<leader>zr", ":CopilotChatReview<CR>", { desc = "Review code (C
keymap.set("v", "<leader>zf", ":CopilotChatFix<CR>", { desc = "Fix code issues (Copilot Chat)" })
keymap.set("v", "<leader>zo", ":CopilotChatOptimize<CR>", { desc = "Optimize code (Copilot Chat)" })
keymap.set("v", "<leader>zd", ":CopilotChatDocs<CR>", { desc = "Generate docs (Copilot Chat)" })
-- Git Conflict Mappings
keymap.set("n", "]x", "<Plug>(git-conflict-next-conflict)", { desc = "Go to next git conflict" })
keymap.set("n", "[x", "<Plug>(git-conflict-prev-conflict)", { desc = "Go to previous git conflict" })
keymap.set("n", "<leader>co", "<Plug>(git-conflict-ours)", { desc = "Choose ours (git conflict)" })
keymap.set("n", "<leader>ct", "<Plug>(git-conflict-theirs)", { desc = "Choose theirs (git conflict)" })
keymap.set("n", "<leader>cb", "<Plug>(git-conflict-both)", { desc = "Choose both (git conflict)" })
keymap.set("n", "<leader>c0", "<Plug>(git-conflict-none)", { desc = "Choose none (git conflict)" })
keymap.set("n", "<leader>cq", "<Plug>(git-conflict-list)", { desc = "List all git conflicts" })

13
lua/cargdev/plugins/gitConflicts.lua Normal file
View File

@@ -0,0 +1,13 @@
return {
"akinsho/git-conflict.nvim",
config = function()
require("git-conflict").setup({
default_mappings = true, -- enable buffer local mapping created by this plugin
disable_diagnostics = true, -- This will disable diagnostics in a buffer whilst it is conflicted
highlights = { -- They must have background color, otherwise the default color will be used
incoming = "DiffText",
current = "DiffAdd",
},
})
end,
}