diff --git a/ASSIGNMENT-04-09-2025.md b/ASSIGNMENT-04-09-2025.md index 3ec440f..e671ac2 100644 --- a/ASSIGNMENT-04-09-2025.md +++ b/ASSIGNMENT-04-09-2025.md @@ -24,3 +24,13 @@ To view the history of specific lines in a file. To get the email id of the user who made the chages in the file. +## Part 3: Merging Branches + +![alt text]() + +## Did Git perform a fast-forward merge or a 3-way merge? +Merge conflict + +## What does git log --graph --oneline --all show after the merge? +![alt text]() + diff --git a/git log --graph --oneline --all.png b/git log --graph --oneline --all.png new file mode 100644 index 0000000..e6f7873 Binary files /dev/null and b/git log --graph --oneline --all.png differ diff --git a/git merge.png b/git merge.png new file mode 100644 index 0000000..83d1147 Binary files /dev/null and b/git merge.png differ