initial commit

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

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
+}