From d71acccb38579ec53ad698c61dc114b6774c035a Mon Sep 17 00:00:00 2001
From: Sebastian Morr <sebastian@morr.cc>
Date: Tue, 15 Sep 2020 09:55:09 +0200
Subject: [PATCH] Merge conflict level

---
 levels/conflict/description |  3 +++
 levels/conflict/start       | 12 ++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 levels/conflict/description
 create mode 100644 levels/conflict/start

diff --git a/levels/conflict/description b/levels/conflict/description
new file mode 100644
index 0000000..8ff892a
--- /dev/null
+++ b/levels/conflict/description
@@ -0,0 +1,3 @@
+Try merging the two branches together!
+
+    git merge <otherbranch>
diff --git a/levels/conflict/start b/levels/conflict/start
new file mode 100644
index 0000000..14de5f4
--- /dev/null
+++ b/levels/conflict/start
@@ -0,0 +1,12 @@
+echo ? > bikeshed_color
+git add .
+git commit -m "Initial commit"
+
+echo green > bikeshed_color
+git commit -a -m "My suggestion"
+
+git switch -c alternative HEAD^
+echo blue > bikeshed_color
+git commit -a -m "This is way better"
+
+git switch main