PyCharm 2016.3 Help

File Cache Conflict

An external process has changed a file, opened and unsaved in PyCharm, which results in two conflicting versions of a file. Resolve this conflict using the following options.

Load FS Changes Click this button to load the file version produced outside of PyCharm, and overwrite your local changes.
Keep Memory Changes Click this button to preserve the version produced in PyCharm and stored in cache.
Show Difference Click this button to invoke the differences viewer that shows the version in the file system to the left, and PyCharm version to the right. You can merge differences as required and load the desired version to PyCharm. By default, the cache version is saved.

See Also

Last modified: 23 December 2016