Started gitcli-basics section.

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