PyCharm 2020.1 Help

File Cache Conflict

If an external process changes a file that was opened and unsaved in PyCharm, it results in two conflicting versions of the file. Use the following options to resolve conflicts.

Item

Description

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.

Last modified: 5 June 2020