Updated the MD file

2025-09-17 16:59:58 +05:30
parent d7b7bf6869
commit fcd60f6174
6 changed files with 14 additions and 0 deletions
--- a/GIT_ASSIGNMENT.md
+++ b/GIT_ASSIGNMENT.md
@ -187,3 +187,17 @@ It acts as a selection area to select the lines between the given numbers
 What extra information does -e provide?
 It shows the commiters email id
 ---
 ## Part 3: Merging Branches
 ## git merge
 ![merge fast forward](git_fast_fwd.png)
 ![git_merge_graph_oneline](git_merge_graph_oneline.png)
 ![merge 1](merge_conflict_1.png)
 ![merge 2](git_merge_conflict_2.png)
 ![merge 3](conflict3.png)
 ---
--- a/conflict3.png
+++ b/conflict3.png
--- a/git_fast_fwd.png
+++ b/git_fast_fwd.png
--- a/git_merge_conflict_2.png
+++ b/git_merge_conflict_2.png
--- a/git_merge_graph_oneline.png
+++ b/git_merge_graph_oneline.png
--- a/merge_conflict_1.png
+++ b/merge_conflict_1.png