View the original community article here
Last tested: May 20, 2019
This error occurs when we try to pull from production while uncommitted changes are in the local dev branch. As a result, git rejects the pull request altogether. Committing changes, then pulling from production will surface the merge conflict.
The same applies when we try to pull from remote with uncommitted changes in the local dev branch.
If you don't care about losing the changes: Commit changes --> Merge Conflict --> Select Revert to Production