DataGrip 2016.2 Help

File Cache Conflict dialog

An external process has changed a file, opened and unsaved in DataGrip, 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 DataGrip, and overwrite your local changes.
Keep Memory Changes Click this button to preserve the version produced in DataGrip 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 DataGrip version to the right. You can merge differences as required and load the desired version to DataGrip. By default, the cache version is saved.

See Also

Last modified: 25 November 2016