From 93c7eca5501a8e1a900bb6534dae5d3e6c0d7b45 Mon Sep 17 00:00:00 2001
From: Matan Kushner <hello@matchai.dev>
Date: Thu, 9 Feb 2023 03:51:38 +0900
Subject: [PATCH] ci: reduce renovate PR noise (#4892)

---
 .github/renovate.json5         | 2 ++
 .github/workflows/workflow.yml | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 455c7429..18f9bdb7 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -9,11 +9,13 @@
         "workarounds:all",
         // automerge minor updates
         ":automergeMinor",
+        ":automergeBranch"
     ],
     "labels": ["📦 dependencies"],
     "semanticCommits": "enabled",
     "semanticCommitType": "build",
     "rangeStrategy": "bump",
+    "rebaseWhen": "conflicted",
     "packageRules": [
         // group updates to related packages
         {
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 98547a03..0f27774f 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -1,8 +1,6 @@
 name: Main workflow
 on:
   push:
-    branches:
-      - master
     paths-ignore:
       - "docs/**"
       - "**.md"