[renovate] disable rebaseConflictedPrs (#52932)

elastic · Dec 12, 2019 · 7e822c5 · 7e822c5
1 parent 98c54e8
commit 7e822c5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/renovate.json5 b/renovate.json5
@@ -954,5 +954,6 @@
     enabled: false,
   },
   rebaseStalePrs: false,
+  rebaseConflictedPrs: false,
   semanticCommits: false,
 }
diff --git a/src/dev/renovate/config.ts b/src/dev/renovate/config.ts
@@ -123,6 +123,11 @@ export const RENOVATE_CONFIG = {
    */
   rebaseStalePrs: false,
 
+  /**
+   * Disable automatic rebase on conflicts with the base branch
+   */
+  rebaseConflictedPrs: false,
+
   /**
    * Disable semantic commit formating
    */