From c0df7b2abadd2443c41c9ddb221539dceb7d12ad Mon Sep 17 00:00:00 2001
From: HANS KREBS <hans.krebs@me.com>
Date: Wed, 27 Aug 2025 07:59:17 +0200
Subject: [PATCH 1/2] For screenshots

---
 dummy1 | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 dummy1

diff --git a/dummy1 b/dummy1
new file mode 100644
index 00000000..e69de29b

From fd766f3346077a64050c0f4bd72e4ebd957f8211 Mon Sep 17 00:00:00 2001
From: HANS KREBS <hans.krebs@me.com>
Date: Wed, 27 Aug 2025 08:03:04 +0200
Subject: [PATCH 2/2] Produce merge conflict

---
 dummy2 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 dummy2

diff --git a/dummy2 b/dummy2
new file mode 100644
index 00000000..257cc564
--- /dev/null
+++ b/dummy2
@@ -0,0 +1 @@
+foo