Merge branch 'feature/traning' into main

Added 1 to 5 numbers
Added fast-forward merge image
2025-09-10 21:11:47 +05:30 · 2025-09-10 21:02:15 +05:30 · 2025-09-10 20:57:57 +05:30
5 changed files with 11 additions and 1 deletions
--- a/ASSIGNMENT-04-09-2025.md
+++ b/ASSIGNMENT-04-09-2025.md
@@ -45,3 +45,13 @@

 ## What extra information does -e provide?
   To get the email id of the user who made the chages in the file.
+
+## Merging Branches
+
+![alt text](<fast-forward merge-1.png>)
+
+![alt text](<fast-forward merge-2.png>) 
+
+## What does git log --graph --oneline --all show after the merge?
+
+![alt text](<git log--graph--oneline--all.png>)
--- a/merge-1.png
+++ b/merge-1.png
--- a/merge-2.png
+++ b/merge-2.png
--- a/file.txt
+++ b/file.txt
@@ -1,5 +1,5 @@
 1
-3
+2
 3
 4
 5
--- a/log--graph--oneline--all.png
+++ b/log--graph--oneline--all.png
Author	SHA1	Message	Date
gokul	9657a1ec1c	Merge branch 'feature/traning' into main	2025-09-10 21:11:47 +05:30
gokul	1d23dbc319	Added 1 to 5 numbers	2025-09-10 21:02:15 +05:30
gokul	33ab345ffc	Added fast-forward merge image	2025-09-10 20:57:57 +05:30