added notes.txt

modified notes.txt
2025-09-11 11:14:24 +05:30 · 2025-09-11 11:12:28 +05:30
5 changed files with 5 additions and 8 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1 @@
-<<<<<<< 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,2 +1,6 @@
 # the text file 
-# murali
+# 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
--- a/todo.txt
+++ b/todo.txt
@@ -1,4 +1 @@
 # 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
solomon	3a7b224047	added notes.txt	2025-09-11 11:14:24 +05:30
solomon	b03060948c	modified notes.txt	2025-09-11 11:12:28 +05:30