From 10c8deb38d2ea5653c38a675d6f4eec43a31def4 Mon Sep 17 00:00:00 2001
From: siarhei-kisialeu <siarhei.kisialeu@simplesurance.de>
Date: Tue, 24 Feb 2026 13:30:49 +0100
Subject: [PATCH 1/3] possible fix

---
 .DS_Store                          | Bin 0 -> 6148 bytes
 internal/.DS_Store                 | Bin 0 -> 6148 bytes
 internal/mergequeue/coordinator.go |  10 +++++++++-
 3 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 .DS_Store
 create mode 100644 internal/.DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..9c2e193044863a810684b30559220c1965908913
GIT binary patch
literal 6148
zcmeHKJ8r`;3?-Wk2D)U-s4L_KLg1dD7s#&x0vHX@&+e(`%F*)p84@_z+{JhVs3%c;
z67&Ys6cJtj9#$d?5ozFt@@K=)Y~OrfFBwrF9A|vVr);G=9=`X3?8gD)HgW>*M?P-(
zyYsoTO&S%T0#twsPys41ssdSFo7YiK<zZBS3QR!(`#u!7VNL7<{nLTLTL9o3VK>aZ
zmjD(E0Bd3&hzLxB3Jj`di=jbBykuTY>;r=?n$3si&6*vG`t3Nsc)Dl}<VXdmz`X*q
zST3yozrmmM|Mw)Wr~nn1lma?$-`h2wl(lv6IIFb<zJXiL1#X79Q!scr26{Qh!piZ|
clOnI!9Q!q~4|F=>P6zU5z;vNef&W(E3bOzejQ{`u

literal 0
HcmV?d00001

diff --git a/internal/.DS_Store b/internal/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..7cd9d5ebf6ff430014663c87f3a2838cf747c16b
GIT binary patch
literal 6148
zcmeHKF>V4u4739U3Jqn-{X%}QLgWQ}AW8@{iBJ;JUzK;|X_>KIfKEshq(NiJo?WkJ
zPdCN+Y-YYZY#z-PW;TNp?T2A(Jg1NBt}+gU<Bm7`v;!jjG9&liK2ZN<yJP-#^Zoj=
z-@mg!CIzH`6p#W^Knh$<foiR@`PFXJMN&Wt+=>GHJ~TM77Y>Q>=|G4P060ZD4C|OB
zfQ<=YFB}q)fq7DaN%a~rJn6`{s_TVAV$#iP`0#qN*M#Enbll&f+`K0$N&zWws=y?-
z3-<pf_?h|tl%$;$kODWQfKONJ)e^5%y>;|*?6nR43}?+RoQ8E!5TYFeqa9<zcKi@U
bS=YG6c`qCigN}UAf%+MsE;1?b-wONzjtCW`

literal 0
HcmV?d00001

diff --git a/internal/mergequeue/coordinator.go b/internal/mergequeue/coordinator.go
index 30e2cee..6073c97 100644
--- a/internal/mergequeue/coordinator.go
+++ b/internal/mergequeue/coordinator.go
@@ -432,7 +432,11 @@ func (a *Coordinator) processPullRequestEvent(ctx context.Context, logger *zap.L
 			)
 			return
 		}
-
+		// If pr == nil, it means that the queue has already been deleted earlier by another event.
+		if pr == nil {
+				logger.Warn("PR already dequeued or queue non-existent")
+				return
+	    	}
 		if ev.PullRequest.GetMerged() {
 			metrics.RecordTimeToMerge(time.Since(pr.EnqueuedAt), owner, repo)
 		}
@@ -926,6 +930,10 @@ func (a *Coordinator) Dequeue(_ context.Context, baseBranch *BaseBranch, prNumbe
 
 	pr, err := q.Dequeue(prNumber, setPendingStatusState)
 	if err != nil {
+		// If there is a queue but no PR in it, this may also be a duplicate.
+		if errors.Is(err, ErrNotFound) {
+			return nil, nil
+		}
 		return nil, fmt.Errorf("removing pr from merge queue failed: %w", err)
 	}
 

From e4f473ca9d7f7d7194ad5d666af74136626b4b08 Mon Sep 17 00:00:00 2001
From: siarhei-kisialeu <siarhei.kisialeu@simplesurance.de>
Date: Tue, 24 Feb 2026 13:34:43 +0100
Subject: [PATCH 2/3] upd gitignore

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index e3882f7..5e8ec3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,5 +4,5 @@
 *.swp
 *.swo
 *.orig
-
+.DS_Store
 dist/

From e929af931cd944ec11f1c14368fef65795700bb7 Mon Sep 17 00:00:00 2001
From: siarhei-kisialeu <siarhei.kisialeu@simplesurance.de>
Date: Tue, 24 Feb 2026 13:49:54 +0100
Subject: [PATCH 3/3] fix fmt

---
 .DS_Store                          | Bin 6148 -> 0 bytes
 internal/.DS_Store                 | Bin 6148 -> 0 bytes
 internal/mergequeue/coordinator.go |   9 ++++++---
 3 files changed, 6 insertions(+), 3 deletions(-)
 delete mode 100644 .DS_Store
 delete mode 100644 internal/.DS_Store

diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index 9c2e193044863a810684b30559220c1965908913..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKJ8r`;3?-Wk2D)U-s4L_KLg1dD7s#&x0vHX@&+e(`%F*)p84@_z+{JhVs3%c;
z67&Ys6cJtj9#$d?5ozFt@@K=)Y~OrfFBwrF9A|vVr);G=9=`X3?8gD)HgW>*M?P-(
zyYsoTO&S%T0#twsPys41ssdSFo7YiK<zZBS3QR!(`#u!7VNL7<{nLTLTL9o3VK>aZ
zmjD(E0Bd3&hzLxB3Jj`di=jbBykuTY>;r=?n$3si&6*vG`t3Nsc)Dl}<VXdmz`X*q
zST3yozrmmM|Mw)Wr~nn1lma?$-`h2wl(lv6IIFb<zJXiL1#X79Q!scr26{Qh!piZ|
clOnI!9Q!q~4|F=>P6zU5z;vNef&W(E3bOzejQ{`u

diff --git a/internal/.DS_Store b/internal/.DS_Store
deleted file mode 100644
index 7cd9d5ebf6ff430014663c87f3a2838cf747c16b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKF>V4u4739U3Jqn-{X%}QLgWQ}AW8@{iBJ;JUzK;|X_>KIfKEshq(NiJo?WkJ
zPdCN+Y-YYZY#z-PW;TNp?T2A(Jg1NBt}+gU<Bm7`v;!jjG9&liK2ZN<yJP-#^Zoj=
z-@mg!CIzH`6p#W^Knh$<foiR@`PFXJMN&Wt+=>GHJ~TM77Y>Q>=|G4P060ZD4C|OB
zfQ<=YFB}q)fq7DaN%a~rJn6`{s_TVAV$#iP`0#qN*M#Enbll&f+`K0$N&zWws=y?-
z3-<pf_?h|tl%$;$kODWQfKONJ)e^5%y>;|*?6nR43}?+RoQ8E!5TYFeqa9<zcKi@U
bS=YG6c`qCigN}UAf%+MsE;1?b-wONzjtCW`

diff --git a/internal/mergequeue/coordinator.go b/internal/mergequeue/coordinator.go
index 6073c97..b757c27 100644
--- a/internal/mergequeue/coordinator.go
+++ b/internal/mergequeue/coordinator.go
@@ -434,9 +434,12 @@ func (a *Coordinator) processPullRequestEvent(ctx context.Context, logger *zap.L
 		}
 		// If pr == nil, it means that the queue has already been deleted earlier by another event.
 		if pr == nil {
-				logger.Warn("PR already dequeued or queue non-existent")
-				return
-	    	}
+			logger.Warn(
+				"PR already dequeued or queue non-existent",
+			)
+			return
+		}
+
 		if ev.PullRequest.GetMerged() {
 			metrics.RecordTimeToMerge(time.Since(pr.EnqueuedAt), owner, repo)
 		}