Updated the MD file
This commit is contained in:
@ -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
|
||||
|
||||

|
||||

|
||||

|
||||

|
||||

|
||||
|
||||
---
|
||||
|
BIN
conflict3.png
Normal file
BIN
conflict3.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 81 KiB |
BIN
git_fast_fwd.png
Normal file
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
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
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
BIN
merge_conflict_1.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 19 KiB |
Reference in New Issue
Block a user