From 6abaf60b54a9da5c2fc5553bb71c456e645687c2 Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Fri, 20 Mar 2026 10:09:16 +0100 Subject: [PATCH] fix(read-only): make the parent folder writable before deleting a file to solve a conflict, we may need to delete a file inside a read-only folder we need to ensure that temporary the parent folder can be modified Signed-off-by: Matthieu Gallien --- src/gui/conflictsolver.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/gui/conflictsolver.cpp b/src/gui/conflictsolver.cpp index c1a14426d6428..1bdd584055b9b 100644 --- a/src/gui/conflictsolver.cpp +++ b/src/gui/conflictsolver.cpp @@ -109,6 +109,10 @@ bool ConflictSolver::deleteLocalVersion() return false; } + const auto fileInfo = QFileInfo{_localVersionFilename}; + const auto parentFolderPath = fileInfo.dir().absolutePath(); + const auto parentPermissionsHandler = FileSystem::FilePermissionsRestore{parentFolderPath, FileSystem::FolderPermissions::ReadWrite}; + if (FileSystem::isDir(_localVersionFilename)) { return FileSystem::removeRecursively(_localVersionFilename); } else {