From 807afc997f12d207e345225eb2ccb910333f2c2d Mon Sep 17 00:00:00 2001
From: Daniel Duarte Tojal <daniel.duarte.001@student.uni.lu>
Date: Fri, 6 Sep 2019 14:20:18 +0200
Subject: [PATCH] create conflictIntro

---
 2019/2019-09-09_testCourseAdv/slides/conflictIntro.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 2019/2019-09-09_testCourseAdv/slides/conflictIntro.md

diff --git a/2019/2019-09-09_testCourseAdv/slides/conflictIntro.md b/2019/2019-09-09_testCourseAdv/slides/conflictIntro.md
new file mode 100644
index 00000000..8970946b
--- /dev/null
+++ b/2019/2019-09-09_testCourseAdv/slides/conflictIntro.md
@@ -0,0 +1,9 @@
+# Theory: Conflict resolution
+
+* A conflict emerges when two files push two different changes 
+to a one target branch
+
+* Some conflict may be resolved automatically, but major conflicts 
+always need to be resolved manually
+
+* Tools exist to streamline conflict resolutions, we use kdiff3
\ No newline at end of file
-- 
GitLab