If there is a conflict between a server and your local machine, when you do a force push the conflict will be shown. You can overwrite the file onto the local system remotely using the following command:
sfdx force:source:push --forceoverwrite
To overwrite local files from the server use the command:
sfdx force:source:pull --forceoverwrite
Get Learning Salesforce Lightning Application Development now with the O’Reilly learning platform.
O’Reilly members experience books, live events, courses curated by job role, and more from O’Reilly and nearly 200 top publishers.
Get Mark Richards’s Software Architecture Patterns ebook to better understand how to design components—and how they should interact.
Dive in for free with a 10-day trial of the O’Reilly learning platform—then explore all the other resources our members count on to build skills and solve problems every day.
Start your free trial Become a member now