From e03fe1801c0b1b55f80dd5260e9e55e5b22eec13 Mon Sep 17 00:00:00 2001
From: Yoann La Cancellera <lacancellera.yoann@gmail.com>
Date: Fri, 1 Sep 2023 16:56:54 +0200
Subject: [PATCH] Fix: forgot to inherit conflicts

---
 src/go/pt-galera-log-explainer/types/ctx.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/go/pt-galera-log-explainer/types/ctx.go b/src/go/pt-galera-log-explainer/types/ctx.go
index 5042161e..f42ea7fd 100644
--- a/src/go/pt-galera-log-explainer/types/ctx.go
+++ b/src/go/pt-galera-log-explainer/types/ctx.go
@@ -230,6 +230,7 @@ func (base *LogCtx) Inherit(ctx LogCtx) {
 	if base.Version == "" {
 		base.Version = ctx.Version
 	}
+	base.Conflicts = append(ctx.Conflicts, base.Conflicts...)
 	base.MergeMapsWith([]LogCtx{ctx})
 }