File Cache Conflict
mail An external process has changed a file, opened and unsaved in IntelliJ IDEA, 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 IntelliJ IDEA, and overwrite your local changes.|
|Keep Memory Changes||Click this button to preserve the version produced in IntelliJ IDEA 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 IntelliJ IDEA version to the right. You can merge differences as required and load the desired version to IntelliJ IDEA. By default, the cache version is saved.|
Last modified: 13 July 2016