Knowledge Drop
Last verified: March 2021
This can happen when your branch on the remote is ahead of your local branch and you go to deploy.
Solution 1: Shift click the git drop down and hit "pull remote changes".
Note that this will overwrite any local changes (anything you've saved without committing) since your last commit.
Solution 2: If pulling from remote doesn't work due to a conflict with files, and it's a relatively small amount of files causing a conflict, save them externally, deleted them from the project, and then try pulling remote changes again. Then you can add the files back by dragging and dropping them into the project.
LinkedIn
Twitter