From 9e7d6696874003e6f05f7072369422082715c070 Mon Sep 17 00:00:00 2001
From: Mark HOEBEKE <mark.hoebeke@sb-roscoff.fr>
Date: Fri, 18 Nov 2022 09:55:18 +0100
Subject: [PATCH] Started gitcli-basics section.

---
 README.md               | 2 +-
 gitcli-basics/README.md | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 gitcli-basics/README.md

diff --git a/README.md b/README.md
index 097c807..0ebb064 100644
--- a/README.md
+++ b/README.md
@@ -28,6 +28,7 @@ Training material for the Git for Beginners ABiMS training session
   1. Displaying information about a local repository
   1. Making changes to the local repository
   1. Propagating changes to the remote repository
+  1. Resolving conflicts
 
 ### Branching Basics
   1. Default branches
@@ -40,7 +41,6 @@ Training material for the Git for Beginners ABiMS training session
   1. Branch Protection
   1. Submitting Merge Requests
   1. Handling Merge Requests
-  1. Resolving Conflicts
 
 ### Using Git through third party tools
   1. Using Git inside R-Studio
diff --git a/gitcli-basics/README.md b/gitcli-basics/README.md
new file mode 100644
index 0000000..e69de29
-- 
GitLab