From d09abed80be3ad9c0fd28c2d7b16640bb22e6c72 Mon Sep 17 00:00:00 2001
From: Benjamin Chausse <benjamin@chausse.xyz>
Date: Tue, 26 Sep 2023 17:51:32 -0400
Subject: Wicked fugitive merge bindings

---
 lua/ben/plugins/fugitive.lua | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/lua/ben/plugins/fugitive.lua b/lua/ben/plugins/fugitive.lua
index 690a958..28edb7f 100644
--- a/lua/ben/plugins/fugitive.lua
+++ b/lua/ben/plugins/fugitive.lua
@@ -14,4 +14,22 @@ return {
 		{ "<leader>gu", "<cmd>G push<CR>" }, -- G.it push U.pstream
 		{ "<leader>gp", "<cmd>G pull<CR>" }, -- G.it P.ull
 	},
+	config = function()
+		-- Use > and < to fix merge conflicts (keep the cursor in the middle of the screen)
+		vim.api.nvim_set_keymap("n", ">", "<cmd>diffg //2<cr><cmd>diffupdate<cr>", { noremap = true, silent = true })
+		vim.api.nvim_set_keymap("n", "<", "<cmd>diffg //3<cr><cmd>diffupdate<cr>", { noremap = true, silent = true })
+		-- Use } and { to force the entire file
+		vim.api.nvim_set_keymap(
+			"n",
+			"}",
+			"<C-w>h<cmd>Gwrite!<cr><cmd>diffupdate<cr>",
+			{ noremap = true, silent = true }
+		)
+		vim.api.nvim_set_keymap(
+			"n",
+			"{",
+			"<C-w>l<cmd>Gwrite!<cr><cmd>diffupdate<cr>",
+			{ noremap = true, silent = true }
+		)
+	end,
 }
-- 
cgit v1.2.3