From 395b501cd3019d156c34281ad3074181adfcc1ac Mon Sep 17 00:00:00 2001
From: Mark HOEBEKE <mark.hoebeke@sb-roscoff.fr>
Date: Thu, 24 Nov 2022 10:56:12 +0100
Subject: [PATCH] Added exercises to branching-basics.

---
 04-branching-basics/exercices.md | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 04-branching-basics/exercices.md

diff --git a/04-branching-basics/exercices.md b/04-branching-basics/exercices.md
new file mode 100644
index 0000000..d5b91a7
--- /dev/null
+++ b/04-branching-basics/exercices.md
@@ -0,0 +1,19 @@
+# Git Branching Basics - Exercises
+
+## Using GitLab
+
+  1. Create a branch dedicated to a subgroup of your animal categories.
+  2. With the Web IDE add one or more entries to you animal description file.
+  3. Commit to your new branch.
+
+## Using the Command Line Interface
+
+  1. Synchronize your local copy of the repository.
+  2. Create another new branch for another subgroup of your animal categories.
+  3. Use an editor to add one or more entries to your animal description file.
+  4. Commit to your new branch.
+  5. Merge your new (local) branch into the main branch.
+  6. Merge the branch created in GitLab into the main branch, and solve conflicts if needed.
+
+
+
-- 
GitLab