Adds new plugins to notes

.config/nvim-notes/lua/config/autocmds.lua

@@ -45,11 +45,19 @@ vim.api.nvim_create_autocmd("VimLeavePre", {
 
 vim.api.nvim_create_autocmd("VimEnter", {
   callback = function()
-    print("Updating...")
-    local command = "git pull --rebase --quiet --no-edit &> /dev/null"
-    local pullSuccess = os.execute(command)
-    if pullSuccess > 0 then
-      os.execute(command)
-    end
+    vim.defer_fn(function()
+      local command = "git pull --rebase --quiet --no-edit &> /dev/null"
+      local pullSuccess = os.execute(command)
+      if pullSuccess == 256 then
+        vim.notify("Conflicts found. Please resolve and continue rebase", "error", {
+          title = "Updating...",
+        })
+        return
+      end
+
+      vim.notify("Pull success", "info", {
+        title = "Updating...",
+      })
+    end, 100)
   end,
 })

.config/nvim-notes/lua/plugins/git-conflict.lua

@@ -0,0 +1,5 @@
+return {
+  "akinsho/git-conflict.nvim",
+  version = "*",
+  config = true,
+}

.config/nvim-notes/lua/plugins/wilder.lua

@@ -0,0 +1,4 @@
+return {
+  "gelguy/wilder.nvim",
+  config = function() end,
+}