From 3a8a2dcbf59ac277637c5e3576b9648024d01c58 Mon Sep 17 00:00:00 2001
From: HANS KREBS <hans.krebs@me.com>
Date: Wed, 27 Aug 2025 08:01:35 +0200
Subject: [PATCH 1/3] For screenshots

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

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

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

---
 dummy2 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dummy2 b/dummy2
index e69de29b..54b060ee 100644
--- a/dummy2
+++ b/dummy2
@@ -0,0 +1 @@
+foo2

From 37b1eaf1c0dae16464f7f4ea0918827933191adc Mon Sep 17 00:00:00 2001
From: HANS KREBS <hans.krebs@me.com>
Date: Wed, 27 Aug 2025 08:12:07 +0200
Subject: [PATCH 3/3] Update for update-branch button

---
 dummy2 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dummy2 b/dummy2
index 54b060ee..67e9cacf 100644
--- a/dummy2
+++ b/dummy2
@@ -1 +1,2 @@
 foo2
+.