pragya

[pragyadiwakar]

lets start by determining the merge conflict.

[pragyadiwakar]

Create a merge conflict using git bash
added a new branch and echoe a message to override file document.txt
commit tchanges.
Go into the master branch and appended a message in the file document.txt and
commit changes.
merge the master branch with the new branch resulting in a merge conflict as

[pragyadiwakar]

resolving the issue by merging the branch and using cat command