From 2e34b21a2b3bacb216e515432e23db1f4a791dbe Mon Sep 17 00:00:00 2001
From: franciscoserucasalgado <97905656+fserucas@users.noreply.github.com>
Date: Mon, 15 Dec 2025 09:55:04 +0000
Subject: [PATCH] Set project merge-mode to rebase

This change sets the merge mode used by Git in this project.
The mode should match the remote system, that in this project is
GitHub.
"rebase" mode, rebase the changes onto the branch when merging.
---
 .zuul.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.zuul.yaml b/.zuul.yaml
index 619001bc..416b4426 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,5 +1,6 @@
 ---
 - project:
+    merge-mode: rebase
     check:
       jobs:
         - pre-commit