PyCharm Edu 2018.1 Help

File Cache Conflict

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

ItemDescription
Load FS Changes Click this button to load the file version produced outside of PyCharm Edu, and overwrite your local changes.
Keep Memory Changes Click this button to preserve the version produced in PyCharm Edu 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 Edu version to the right. You can merge differences as required and load the desired version to PyCharm Edu. By default, the cache version is saved.
Last modified: 23 July 2018