Added images for merge conflicts

Merge branch 'feature/traning' into main
Added 1 to 10 numbers
2025-09-11 10:14:19 +05:30 · 2025-09-10 21:11:47 +05:30 · 2025-09-10 21:03:45 +05:30 · 2025-09-10 21:02:15 +05:30
6 changed files with 29 additions and 2 deletions
--- a/ASSIGNMENT-04-09-2025.md
+++ b/ASSIGNMENT-04-09-2025.md
@@ -52,6 +52,25 @@
 ![alt text](<fast-forward merge-2.png>) 
 ## Merge Conflict 
 ![alt text](<add number in main and training branch.png>)
 ![alt text](<merge conflict.png>)
 ![alt text](<merge conflict1.png>)
 ## Did Git perform a fast-forward merge or a 3-way merge?
 Perform fast-forward merge and merge conflict
 ## What does git log --graph --oneline --all show after the merge?
 ![alt text](<git log--graph--oneline--all.png>)
 ## git log --graph --oneline --all after Merge conflict
 ![alt text](<git log graph oneline after merge conflict.png>)
--- a/branch.png
+++ b/branch.png
--- a/file.txt
+++ b/file.txt
@@ -1,2 +1,10 @@
-hello
+1
-Hi
+2
 3
 4
 5
 6
 7
 8
 9
 10
--- a/conflict.png
+++ b/conflict.png
--- a/conflict.png
+++ b/conflict.png
--- a/conflict1.png
+++ b/conflict1.png
Author	SHA1	Message	Date
gokul	c87ff0ff92	Added images for merge conflicts	2025-09-11 10:14:19 +05:30
gokul	9657a1ec1c	Merge branch 'feature/traning' into main	2025-09-10 21:11:47 +05:30
gokul	2912e22546	Added 1 to 10 numbers	2025-09-10 21:03:45 +05:30
gokul	1d23dbc319	Added 1 to 5 numbers	2025-09-10 21:02:15 +05:30
`@@ -1,2 +1,10 @@`
	`hello`	`1`
	`Hi`	`2`
		`3`
		`4`
		`5`
		`6`
		`7`
		`8`
		`9`
		`10`