hopefully finally fix this rebasing mess

Author: Crypto-Spartan

init.lua

@@ -156,8 +156,15 @@ vim.opt.cursorline = true
 -- Minimal number of screen lines to keep above and below the cursor.
 vim.opt.scrolloff = 10
 
+<<<<<<< HEAD
 -- Attempt to open files with the following file encodings, left to right
 vim.opt.fileencodings = {'ucs-bom','utf-8','sjis','default','latin1'}
+=======
+-- if performing an operation that would fail due to unsaved changes in the buffer (like `:q`),
+-- instead raise a dialog asking if you wish to save the current file(s)
+-- See `:help 'confirm'`
+vim.opt.confirm = true
+>>>>>>> 38f4744 (feat: add `vim.opt.confirm = true` (#1384))
 
 -- [[ Basic Keymaps ]]
 --  See `:help vim.keymap.set()`