merge the file

2025-09-11 12:17:18 +05:30
parent 8257c78a02 8642962101
commit c5a3437b79
4 changed files with 10 additions and 0 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/todo.txt
+++ b/todo.txt
@@ -1 +1,7 @@
 # bug sheet file added
+<<<<<<< HEAD
+=======
+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
+>>>>>>> feature/bugSheet