search

jonathanmorris180 / salesforce.nvim

A Salesforce plugin for Neovim.
MIT License
20 stars 5 forks source link

Ignore conflicts when deploying #18

Closed lechum2 closed 4 months ago

lechum2 commented 5 months ago

Describe the problem

There is a configuration option for file manager to ignore conflicts. This option adds --ignore-conflicts flag for sf project retrieve command. I would also like to have that same option for sf project deploy command.

Describe the solution

Option 1 would be to utilise the same configuration option and just add --ignore-conflicts flag to the deploy command in the same way as it is done for retrieve command.

Option 2 might be to change the setting and have a separate one for retrieval and deployment. Than use those settings when adding a flag to retrieve and deploy commands respectively.

lechum2 commented 5 months ago

Personally I use git as the source of truth for my orgs and I don't care for conflicts with what is on sandboxes. Option 1 would work for me.

jonathanmorris180 commented 5 months ago

Hi @lechum2, thanks for opening this. I think to make this the most configurable for users moving forward, your second option might be best. Should be a quick fix—I'll add it to the next release.

jonathanmorris180 commented 4 months ago

@lechum2 Apologies for the delay with this, things have been busy! #21 resolves this issue—I just went the simple route and kept the configuration the same to avoid breaking changes. --ignore-conflicts is now added to both commands when the config option is set to true.

lechum2 commented 4 months ago

@jonathanmorris180 you've got nothing to apologize for! Thank you for the change, and all your work on the extension!