From 7f8afce0aa2d361e6299be79ee685a22582c7529 Mon Sep 17 00:00:00 2001
From: Jari Haavisto <jari.haavisto@buutti.com>
Date: Fri, 24 Nov 2023 10:15:53 +0200
Subject: [PATCH] initial commit

---
 README.md         | 14 ++++++++++++++
 src/calculator.ts | 15 +++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 README.md
 create mode 100644 src/calculator.ts

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..eca808c
--- /dev/null
+++ b/README.md
@@ -0,0 +1,14 @@
+# DEMO: Git Conflict
+
+1) Pull the repository
+2) Checkout to a feature branch
+3) Make changes
+4) Checkout to main
+5) Checkout to another feature branch
+6) Make conflicting changes
+7) Merge the changes
+8) Checkout to main
+
+9) Checkout to first feature branch
+10) Merge the changes
+11) Resolve conflict
\ No newline at end of file
diff --git a/src/calculator.ts b/src/calculator.ts
new file mode 100644
index 0000000..738fbcc
--- /dev/null
+++ b/src/calculator.ts
@@ -0,0 +1,15 @@
+function addition(a, b) {
+    return a + b
+}
+
+function substraction(a, b) {
+    return a - b
+}
+
+function multiplication(a, b) {
+    // TODO: finish multiplication function
+}
+
+function division(a, b) {
+    // TODO: finish division function
+}