MERGE ISSUE-SHAMBHAVI_TASK4

[Shambhavipandey26]

I will be uploading the screenshots of merge conflict that I will create.

[Shambhavipandey26]

Here, I have made a merge conflict by making another branch other than the master branch.
In master branch, I have made a file names merge.txt and in the new branch I have override the content which was earlier in merge.txt file and commit both the changes respectively.
Then chain of commands checks out the master branch, appends content to merge.txt, and commits it. This now puts repo in a state where we have 2 new commits. One in the master branch and one in the newbranch branch.
Now while merging we will get a merge conflict.

To identify the merge conflict I have used git status command which tells us the unmerged path arising the conflicts. and then we use cat merge.txt to see the contents of the file.

RESOLVING THE ISSUE:

To resolve the issue I have used Ccommand line and by opening the merge.txt file, i have removed the conflict dividers
Now when I try to merge the files they are merged and shows no error.