diff --git a/GIT_ASSIGNMENT.md b/GIT_ASSIGNMENT.md index ad1a3ce..5fa2458 100644 --- 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) + +--- diff --git a/conflict3.png b/conflict3.png new file mode 100644 index 0000000..19fa006 Binary files /dev/null and b/conflict3.png differ diff --git a/git_fast_fwd.png b/git_fast_fwd.png new file mode 100644 index 0000000..dce45bc Binary files /dev/null and b/git_fast_fwd.png differ diff --git a/git_merge_conflict_2.png b/git_merge_conflict_2.png new file mode 100644 index 0000000..62393a1 Binary files /dev/null and b/git_merge_conflict_2.png differ diff --git a/git_merge_graph_oneline.png b/git_merge_graph_oneline.png new file mode 100644 index 0000000..47126ea Binary files /dev/null and b/git_merge_graph_oneline.png differ diff --git a/merge_conflict_1.png b/merge_conflict_1.png new file mode 100644 index 0000000..38b65cc Binary files /dev/null and b/merge_conflict_1.png differ