PhpStorm 2017.2 Help

File Cache Conflict

An external process has changed a file, opened and unsaved in PhpStorm, 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 PhpStorm, and overwrite your local changes.
Keep Memory Changes Click this button to preserve the version produced in PhpStorm 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 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: 28 November 2017

See Also