Sarthak's conflict

[sarthakschandel]

Resolving merge conflict

[sarthakschandel]

I created a merge conflict using git bash where I added a new branch and worked on it and echoed a message to override my file merge.txt which I created and then used commit to save the changes. Then I went into the master branch and appended a message in the file merge.txt and then used commit to save the changes. After that, I merged the master branch with the new branch that I created which resulted in a merge conflict as :

Resolving the issue:
To solve the issue, I merged the branches and then used cat command to see the content in the file merge.txt.After that I added this file merge.txt and commit the message which resolved the issue which was created earlier as: