From 5eafdf03dbe44684a2d60eda78a9d09901c50947 Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <liw@liw.fi>
Date: Wed, 17 Nov 2021 18:52:18 +0200
Subject: merge, don't rebase

Sponsored-by: author
---
 ci-prod.ick | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ci-prod.ick b/ci-prod.ick
index ed3005e..cf3d4e6 100644
--- a/ci-prod.ick
+++ b/ci-prod.ick
@@ -1257,3 +1257,4 @@ pipelines:
           cd src
           git branch -a
           git checkout liw/debian
+          git merge --ff --no-commit
-- 
cgit v1.2.1