I've hit an error asking me to either commit or stash my changes while trying to pull, what do I do next?
Problem: When trying to pull in the WVS Desktop client, I got an error:
Error
Failed to merge branch 'main' into branch 'wvs-stage' because the following files would be overwritten:
[1] Content/MyTestFile.uasset
Please commit your changes or stash them before you merge.
Aborting
Answer:
This error message asks you to either to commit/submit your changes to your remote repository or (stash) save a copy of your file somewhere before you merge.
The problem with the message is that you can't commit because of your current changes.
The next thing to do is to stash (save a copy) your file somewhere locally but not in the same folder as your current project. Now that you have a copy of your file, you can undo the last changes you made in the file. This should put you back in the same state.
After undoing your changes, you can try to pull again.