Conflict
Created a merge conflict in master branch and newbranch. Added a new message through echo command to override my file intro.txt , then add the file and commit it. After I went into the master branch and appended a message in the file intro.xt and add changes then commit to save the changes.
Finally, merged the master branch with the new branch that I created which resulted in a merge conflict.
Resolved
To solve the issue, cat command is used to see the content in the file intro.txt. After that I added this file intro.txt and commit the message which resolved the issue.
Conflict
Created a merge conflict in master branch and newbranch. Added a new message through echo command to override my file intro.txt , then add the file and commit it. After I went into the master branch and appended a message in the file intro.xt and add changes then commit to save the changes.
Finally, merged the master branch with the new branch that I created which resulted in a merge conflict.
Resolved
To solve the issue, cat command is used to see the content in the file intro.txt. After that I added this file intro.txt and commit the message which resolved the issue.
