first draft

bast · bast · commit 2ff7ff6d855a · 2021-05-04T20:32:51.000+02:00
diff --git a/README.md b/README.md
@@ -0,0 +1,5 @@
+# Example to discuss and practice Git conflict resolution
+
+There are two branches: `improve-starters` and `improve-desserts`
+and you can try to merge one into the other to discuss and practice conflict
+resolution.
diff --git a/desserts.md b/desserts.md
@@ -0,0 +1,7 @@
+
+
+# Desserts
+
+- Rhubarb tart
+- I scream
+- Almond cake
diff --git a/main-course.md b/main-course.md
@@ -0,0 +1,7 @@
+
+
+# Main
+
+- Pan-fried chicken
+- Roasted vegetables
+- Vegan red carry
diff --git a/starters.md b/starters.md
@@ -0,0 +1,6 @@
+
+
+# Starters
+
+- Spiced salmon
+- Summer tomato and herb salad
