4TUResearchData-Carpentries · carlosug · Oct 1, 2024 · Oct 7, 2024 · Oct 8, 2024 · Oct 8, 2024
diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,7 @@ venv/*
 
 # Builds
 */_build/
-
+.vscode/
 
 # Mac OS X
 .DS_Store
diff --git a/gitcodev/exercises/L2-ex04.md b/gitcodev/exercises/L2-ex04.md
@@ -2,14 +2,10 @@
 # Lesson 2 Episode 1 --- a first type of merge
 Please perform the following tasks individually
 
-How many more lines has `Lines.txt` in B1 than in main?
-Please merge B1 in main
+How many more lines has `Lines.txt` in B2 than in main?
+Please merge B2 in main
 Verify the outcome with a graphed `git log`
 
-````{attention}
-* DO NOT merge B2
-* DO NOT delete branches
-````
 
 Formulate your explanation of what you have observed
 The following questions are two sides of the same coin:

diff --git a/gitcodev/image-1.png b/gitcodev/image-1.png
diff --git a/gitcodev/image-2.png b/gitcodev/image-2.png
diff --git a/gitcodev/image-3.png b/gitcodev/image-3.png
diff --git a/gitcodev/image-4.png b/gitcodev/image-4.png
diff --git a/gitcodev/image-5.png b/gitcodev/image-5.png
diff --git a/gitcodev/image.png b/gitcodev/image.png