From 9a0b90063c46e019a70bab7f25bd60dd17f1df03 Mon Sep 17 00:00:00 2001
From: Max <meifler@students.uni-mainz.de>
Date: Thu, 17 Aug 2023 11:36:23 +0200
Subject: [PATCH] Update notes.md with git merge

---
 src/day_3/notes.md | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/day_3/notes.md b/src/day_3/notes.md
index a688351..0e5e1c2 100644
--- a/src/day_3/notes.md
+++ b/src/day_3/notes.md
@@ -4,21 +4,6 @@ The participants of the course will add a description to each of these Git subco
 
 ## git config
 
-This command is used to pass information onto git.
-
-
-Example:
-
-```bash
-$ git config --global user.name "USERNAME"
-```
-
-and 
-
-```bash
-$ git config --global user.email "EMAIL"
-```
-
 ## git init
 
 ## git clone
@@ -61,6 +46,15 @@ if you want to stage all changes.
 
 ## git merge
 
+This command is used to combine two branches together. Use git checkout to visit the branch you want to merge to.
+
+```bash
+$ git checkout main
+$ git merge branch2
+```
+
+This will merge the branch "branch2" into the branch, where this command was executed in.(Here: "main")
+
 ## git reset
 
 ## git revert