merge file

merge the file
mareg the file
2025-09-18 12:06:23 +05:30 · 2025-09-11 12:17:18 +05:30 · 2025-09-11 10:31:04 +05:30 · 2025-09-04 10:20:41 +05:30 · 2025-08-30 11:52:01 +05:30 · 2025-08-23 12:26:20 +05:30
5 changed files with 8 additions and 5 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,5 @@
+<<<<<<< HEAD
 secret.txt
+=======
+secret.txt
+>>>>>>> feature/bugSheet
--- a/README.md
+++ b/README.md
--- a/gitcheckout.png
+++ b/gitcheckout.png
--- a/notes.txt
+++ b/notes.txt
@@ -1,6 +1,2 @@
 # the text file 
-# murali krishnan
-#Version Control is a system that records changes to files over time.
-It’s distributed, meaning every developer has a full copy of the project history (not just files).
-Hello Mark
-hello mark
+# murali
--- a/todo.txt
+++ b/todo.txt
@@ -1 +1,4 @@
 # bug sheet file added
+The git merge command in Git is used to integrate changes from one branch into another. 
+This process combines the independent lines of development created by git branch and 
+integrates them into a single, unified branch
Author	SHA1	Message	Date
muralikrishnan.rajamuni	cb3ba42581	merge file	2025-09-18 12:06:23 +05:30
muralikrishnan.rajamuni	c5a3437b79	merge the file	2025-09-11 12:17:18 +05:30
muralikrishnan.rajamuni	8642962101	mareg the file	2025-09-11 10:31:04 +05:30
muralikrishnan.rajamuni	559cf18b71	add file readme.md	2025-09-04 10:20:41 +05:30
muralikrishnan.rajamuni	dea0695eb0	gitignore file	2025-08-30 11:52:01 +05:30
muralikrishnan.rajamuni	2b4e92d9d1	bug sheet file added	2025-08-23 12:26:20 +05:30
muralikrishnan.rajamuni	43741c73f5	add the file	2025-08-23 12:16:15 +05:30
muralikrishnan.rajamuni	2535add914	new file	2025-08-23 12:07:18 +05:30