assignment 3

add a new line in master to triger conflict
new commit 2 for example file in new1
2025-09-18 10:43:47 +05:30 · 2025-09-18 09:57:18 +05:30 · 2025-09-18 09:55:56 +05:30 · 2025-09-18 09:53:13 +05:30
5 changed files with 13 additions and 2 deletions
--- a/ASSIGNMENT-04-09-2025.md
+++ b/ASSIGNMENT-04-09-2025.md
@ -10,3 +10,9 @@
 ![blame ](blame.png)
 ![blame3,5](blame-L.png)
 ![blame-E](blame-E.png)
+
+## Part 3: Merging Branches
+
+![merge conflict](cmd_msg.png)
+![merge conflict 1](<conflict .png>)
+![git_oneline](git_oneline_graph.png)
--- a/cmd_msg.png
+++ b/cmd_msg.png
--- a/.png
+++ b/.png
--- a/example.txt
+++ b/example.txt
@ -1,3 +1,8 @@
 hello tech Thursday
 tech Thursday 2
 tech Thursday 3
+helo2
+tech Thursday 5
+hello 4 missing
+line1
+line 2
--- a/git_oneline_graph.png
+++ b/git_oneline_graph.png
Author	SHA1	Message	Date
Nikhil	26dd5270e5	assignment 3	2025-09-18 10:43:47 +05:30
Nikhil	e9694e4487	add a new line in master to triger conflict	2025-09-18 09:57:18 +05:30
Nikhil	da019ea384	new commit 2 for example file in new1	2025-09-18 09:55:56 +05:30
Nikhil	80964760ab	adding example text file	2025-09-18 09:53:13 +05:30