Best Practices
Retrieve changes and resolve conflicts before deploying your changes to a sandbox
This practice helps other developers incorporate your changes and facilitates collaboration.
Review metadata change history with a version control system like Git
With a version control system, you can version your changes, track change history, and review metadata changes before promoting to other environments, such as a sandbox.
Get source tracking files back into sync
If source tracking gets confused and starts reporting inaccuracies, you can use the project deploy|retrieve start commands to get back into sync. Which command you use depends on which source you most trust: use project deploy start if you trust your local source files and project retrieve start if you trust what’s in your org. For either command, specify the --ignore-conflicts flag. See Resolve Conflicts Between Your Local Project and Org for details and examples.