diff --git a/lib/platform/git/storage.js b/lib/platform/git/storage.js
index a788c4e751c2e7f008e101e9c94c9e83dca64941..e131007d18fac9e155432aaf55bac37ee1f78bef 100644
--- a/lib/platform/git/storage.js
+++ b/lib/platform/git/storage.js
@@ -224,7 +224,13 @@ class Storage {
         logger.debug({ branchName }, 'Deleted remote branch');
       } catch (err) /* istanbul ignore next */ {
         logger.info({ branchName, err }, 'Error deleting remote branch');
-        throw new Error('repository-changed');
+        if (err.message.includes('.github/main.workflow')) {
+          logger.warn(
+            'A GitHub bug prevents gitFs + GitHub Actions. Please disable gitFs'
+          );
+        } else {
+          throw new Error('repository-changed');
+        }
       }
       try {
         await deleteLocalBranch(branchName);
@@ -297,7 +303,11 @@ class Storage {
         ]);
       } catch (err) /* istanbul ignore next */ {
         logger.debug({ err }, 'Error commiting files');
-        if (err.message.includes('[remote rejected]')) {
+        if (err.message.includes('.github/main.workflow')) {
+          logger.warn(
+            'A GitHub bug prevents gitFs + GitHub Actions. Please disable gitFs'
+          );
+        } else if (err.message.includes('[remote rejected]')) {
           throw new Error('repository-changed');
         }
         throw err;