From 15e0600521f36af644fd4906149ed898a8a9b3af Mon Sep 17 00:00:00 2001
From: Alan Agius <alanagius@google.com>
Date: Mon, 6 May 2024 09:51:26 +0000
Subject: [PATCH] ci: remove `stopUpdatingLabel` setting (#55683)

This commit removes the 'stopUpdatingLabel' option from Renovate settings. This option caused pull requests to not automatically rebase when  conflicting.

PR Close #55683
---
 renovate.json | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/renovate.json b/renovate.json
index 81d3bdbb6f3..c8b177e589d 100644
--- a/renovate.json
+++ b/renovate.json
@@ -2,7 +2,6 @@
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "baseBranches": ["main"],
   "enabledManagers": ["npm", "bazel", "github-actions"],
-  "stopUpdatingLabel": "action: merge",
   "rangeStrategy": "replace",
   "pinDigests": true,
   "semanticCommits": "enabled",
@@ -72,7 +71,11 @@
 
     {
       "matchPackagePrefixes": ["@angular/", "angular/", "@angular-devkit", "@schematics/"],
-      "matchPaths": ["packages/**", "aio/tools/examples/shared/**", "adev/src/content/tutorials/**"],
+      "matchPaths": [
+        "packages/**",
+        "aio/tools/examples/shared/**",
+        "adev/src/content/tutorials/**"
+      ],
       "followTag": null
     },
 
@@ -107,6 +110,9 @@
 
     {"matchCurrentVersion": "0.0.0-PLACEHOLDER", "enabled": false},
 
-    {"matchPaths": ["integration/**", "packages/zone.js/test/typings/package.json"], "enabled": false}
+    {
+      "matchPaths": ["integration/**", "packages/zone.js/test/typings/package.json"],
+      "enabled": false
+    }
   ]
 }