Updated the MD file

This commit is contained in:
2025-09-17 16:59:58 +05:30
parent d7b7bf6869
commit fcd60f6174
6 changed files with 14 additions and 0 deletions

View File

@ -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)
---

BIN
conflict3.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 81 KiB

BIN
git_fast_fwd.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 74 KiB

BIN
git_merge_conflict_2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

BIN
git_merge_graph_oneline.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 97 KiB

BIN
merge_conflict_1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB