Merge branch 'feature/mergeAssignment' into feature/gitAssignment

added new line in old branch
added new line in new branch
2025-09-11 13:14:11 +05:30 · 2025-09-11 12:29:12 +05:30 · 2025-09-11 12:28:02 +05:30 · 2025-09-11 12:15:28 +05:30 · 2025-09-11 12:14:36 +05:30 · 2025-09-11 12:13:48 +05:30
3 changed files with 12 additions and 0 deletions
--- a/example.txt
+++ b/example.txt
@@ -0,0 +1,5 @@
+added new file
+added line one 
+added line two
+added line three
+added line four in new branch
--- a/readme.md
+++ b/readme.md
@@ -0,0 +1,7 @@
+- Created readme.md in a repo and renamed it to README.md
+- ![Repository_Screenshot](readme.png)
+- Git didn’t show changes because windows system is case-insensitive
+- Fixed it using:
+    `git mv -f readme.md README.md`
+    `git commit -m "Rename readme.md to README.md"`
+- Reason: Git is case-sensitive, but case-insensitive filesystems treat both names as the same
--- a/readme.png
+++ b/readme.png
Author	SHA1	Message	Date
jaya.lekshmi	74bd455dbf	Merge branch 'feature/mergeAssignment' into feature/gitAssignment	2025-09-11 13:14:11 +05:30
jaya.lekshmi	7c33d785ba	added new line in old branch	2025-09-11 12:29:12 +05:30
jaya.lekshmi	d54f69e33c	added new line in new branch	2025-09-11 12:28:02 +05:30
jaya.lekshmi	03d0464d1b	add line three	2025-09-11 12:15:28 +05:30
jaya.lekshmi	5f7a68af9f	add line two	2025-09-11 12:14:36 +05:30
jaya.lekshmi	0244faa2f4	add line one	2025-09-11 12:13:48 +05:30
jaya.lekshmi	7ac7bba1db	add new file	2025-09-11 12:12:06 +05:30
jaya.lekshmi	ed6fdf856f	added new steps	2025-09-04 12:22:05 +05:30
jaya.lekshmi	bb1bae28ee	new file created	2025-09-04 11:56:09 +05:30