Occasionally I will be working on a class file.
- Another developer edits the class file while I am working on it.
- I get the error that I cannot save, has pending server changes.
- I attempt to pull the latest version, then manually merge my previous edits that I could not save.
- I still get an error saying to pull the latest version. Right after I perform a pull. It is like the local version is not updated.
Is there a work around for this?