merge file
This commit is contained in:
@@ -1,5 +1,2 @@
|
|||||||
# the text file
|
# the text file
|
||||||
# murali krishnan
|
# murali
|
||||||
#Version Control is a system that records changes to files over time.
|
|
||||||
Git is the most popular Version Control System
|
|
||||||
It’s distributed, meaning every developer has a full copy of the project history (not just files).
|
|
||||||
|
|||||||
3
todo.txt
3
todo.txt
@@ -1,7 +1,4 @@
|
|||||||
# bug sheet file added
|
# bug sheet file added
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
The git merge command in Git is used to integrate changes from one branch into another.
|
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
|
This process combines the independent lines of development created by git branch and
|
||||||
integrates them into a single, unified branch
|
integrates them into a single, unified branch
|
||||||
>>>>>>> feature/bugSheet
|
|
||||||
|
|||||||
Reference in New Issue
Block a user