fix: add --ignore-conflicts for sf project deploy

README.md

@@ -126,7 +126,7 @@ require("salesforce").setup({
         borderchars = { "─", "│", "─", "│", "╭", "╮", "╯", "╰" },
     },
     file_manager = {
-        ignore_conflicts = false,
+        ignore_conflicts = false, -- ignores conflicts on "sf project retrieve/deploy"
     },
     org_manager = {
         default_org_indicator = "󰄬",

doc/salesforce.txt

@@ -42,7 +42,7 @@ You can pass in a lua table of options to customize the plugin. The default opti
         borderchars = { "─", "│", "─", "│", "╭", "╮", "╯", "╰" },
     },
     file_manager = {
-        ignore_conflicts = false,
+        ignore_conflicts = false, -- ignores conflicts on "sf project retrieve/deploy"
     },
     org_manager = {
         default_org_indicator = "󰄬",

lua/salesforce/file_manager.lua

@@ -185,6 +185,10 @@ M.push_to_org = function()
     Util.clear_and_notify(string.format("Pushing %s to org %s...", file_name, default_username))
     local command =
         string.format("%s project deploy start --json -o %s", executable, default_username)
+    if Config:get_options().file_manager.ignore_conflicts then
+        Debug:log("file_manager.lua", "Ignoring conflicts becuase of config option")
+        command = command .. " --ignore-conflicts"
+    end
     Debug:log("file_manager.lua", "Command: " .. command .. string.format(" -d '%s'", path))
     push(command, path)
 end

lua/salesforce/init.lua

@@ -38,7 +38,7 @@
 ---         borderchars = { "─", "│", "─", "│", "╭", "╮", "╯", "╰" },
 ---     },
 ---     file_manager = {
----         ignore_conflicts = false,
+---         ignore_conflicts = false, -- ignores conflicts on "sf project retrieve/deploy"
 ---     },
 ---     org_manager = {
 ---         default_org_indicator = "󰄬",