added notes.txt

.gitignore

@@ -1,5 +1 @@
-<<<<<<< HEAD
 secret.txt
-=======
-secret.txt
->>>>>>> feature/bugSheet

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

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