diff --git a/src/core/FileWatcher.cpp b/src/core/FileWatcher.cpp index fb8e95128..0bc5e3444 100644 --- a/src/core/FileWatcher.cpp +++ b/src/core/FileWatcher.cpp @@ -143,7 +143,9 @@ QByteArray FileWatcher::calculateChecksum() } return hash.result(); } - return {}; + // If we fail to open the file return the last known checksum, this + // prevents unnecessary merge requests on intermittent network shares + return m_fileChecksum; }); }