sam_oneal
2906689a29
Avoid overlapping LSP/diffview keymaps on a new Git > Conflict (<leader>gx*) group. Navigation stays on ]x/[x.
79 lines
1.5 KiB
Lua
79 lines
1.5 KiB
Lua
return {
|
|
{
|
|
"NeogitOrg/neogit",
|
|
dependencies = {
|
|
"nvim-lua/plenary.nvim",
|
|
"sindrets/diffview.nvim",
|
|
},
|
|
cmd = "Neogit",
|
|
opts = {
|
|
integrations = {
|
|
diffview = true,
|
|
},
|
|
},
|
|
},
|
|
{
|
|
"madmaxieee/unclash.nvim",
|
|
lazy = false,
|
|
opts = {
|
|
action_buttons = {
|
|
enabled = true,
|
|
},
|
|
annotations = {
|
|
enabled = true,
|
|
},
|
|
},
|
|
keys = {
|
|
{
|
|
"]x",
|
|
function()
|
|
require("unclash").next_conflict()
|
|
end,
|
|
desc = "Next Conflict",
|
|
},
|
|
{
|
|
"[x",
|
|
function()
|
|
require("unclash").prev_conflict()
|
|
end,
|
|
desc = "Prev Conflict",
|
|
},
|
|
{
|
|
"<leader>gxc",
|
|
function()
|
|
require("unclash").accept_current()
|
|
end,
|
|
desc = "Accept Current (Conflict)",
|
|
},
|
|
{
|
|
"<leader>gxi",
|
|
function()
|
|
require("unclash").accept_incoming()
|
|
end,
|
|
desc = "Accept Incoming (Conflict)",
|
|
},
|
|
{
|
|
"<leader>gxb",
|
|
function()
|
|
require("unclash").accept_both()
|
|
end,
|
|
desc = "Accept Both (Conflict)",
|
|
},
|
|
{
|
|
"<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 (Snacks)",
|
|
},
|
|
},
|
|
},
|
|
}
|