Last Tested: Sep 20, 2019
The most typical scenario that this error appears is as follows:
As a troubleshooting measure, make an arbitrary change to your LookML (like add a comment "#"), save and try to pull again. This tends to resolve the error.
Otherwise, the easiest way to fix this would be to log into Github/other git provider and complete the pull and merge outside of Looker to fix the error. Alternatively, you can save changes to the LookML externally (in a Word doc or Notes file), revert to production, and copy the changes back in.
This content is subject to limited support.