Merge Conflict II: Not sure what to delete


#1

Exercise 8/10

"Delete the content of the line as it appears in the master branch

Delete all of Git’s special markings including the words HEAD and fencing. If any of Git’s markings remain, for example, >>>>>>> and =======, the conflict remains."

I’m not exactly sure what the instructions want me to delete. Also, I’m not sure what they mean by special characters? I typed “git diff” and I notice the difference between the master branch’s resume.txt and the fencing’s resume.txt. I’m just not sure what to delete? And we’re talking about the text editor or are we talking about deleting stuff in the terminal?


#2

This topic was automatically closed 7 days after the last reply. New replies are no longer allowed.