PhpStorm 2021.1 Help

File Cache Conflict

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

Load FS ChangesClick this button to load the file version produced outside of PhpStorm, and overwrite your local changes.
Keep Memory ChangesClick this button to preserve the version produced in PhpStorm and stored in cache.
Show DifferenceClick this button to invoke the differences viewer that shows the version in the file system to the left, and PhpStorm version to the right. You can merge differences as required and load the desired version to PhpStorm. By default, the cache version is saved.
Last modified: 08 March 2021