From 86f830c33d1e50d1716b2e3c13629e2945f5a604 Mon Sep 17 00:00:00 2001
From: "W. Augusto Andreoli" <andreoliwa@gmail.com>
Date: Thu, 18 May 2023 13:40:12 +0200
Subject: [PATCH] ci(renovate): automerge using branches

---
 .github/renovate.json5 | 6 ++++++
 .gitignore             | 5 ++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index b552c9e8..c7909e2d 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -2,6 +2,12 @@
   extends: ["config:base"],
   // https://docs.renovatebot.com/configuration-options/#automerge
   automerge: true,
+  // https://docs.renovatebot.com/configuration-options/#automergetype
+  automergeType: "branch",
+  // https://docs.renovatebot.com/modules/manager/pre-commit/
+  "pre-commit": {
+    enabled: true,
+  },
   ignoreDeps: ["jedi"],
   // https://docs.renovatebot.com/configuration-options/#prconcurrentlimit
   prConcurrentLimit: 3,
diff --git a/.gitignore b/.gitignore
index ec2fcbee..108f0176 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,6 +47,8 @@ coverage.xml
 *.cover
 .hypothesis/
 .pytest/
+# pytest-testmon
+.testmondata*
 
 # Translations
 *.mo
@@ -114,6 +116,3 @@ ENV/
 
 # macOS
 .DS_Store
-
-# pytest-testmon
-.testmondata