Welcome to the Treehouse Community
Want to collaborate on code errors? Have bugs you need feedback on? Looking for an extra set of eyes on your latest project? Get support with fellow developers, designers, and programmers of all backgrounds and skill levels here with the Treehouse Community! While you're at it, check out some resources Treehouse students have shared here.
Looking to learn something new?
Treehouse offers a seven day free trial for new students. Get access to thousands of hours of content and join thousands of Treehouse students and alumni in the community today.
Start your free trial
Abdullahi Abdinasir Ali
9,520 PointsWhat resolution should remove and persemetic problem
Can anyone explain what the quiz is asking plz
This is a text file! It's a fun little text file -
it never really did anything to hurt anyone.
The only problem with our fun little text file
is that it has conflict resolution issues.
<<<<<<< HEAD
It tries its best to resolve problems on its own.
=======
It pretty much can't ever resolve problems.
>>>>>>> pessimistic_branch
Whenever it runs into a problem, it asks other people for help.
<<<<<<< HEAD
Maybe you can help it resolve its issues?
=======
But it's a very needy file, so people often leave it alone.
>>>>>>> pessimistic_branch
1 Answer
Michael Watson
Treehouse TeacherAbdullahi Abdinasir Ali the quiz is asking you to remove the conflicts directly in the text file. You'll do this by removing conflict markers and keeping the version of the text specified in the quiz. The video just before this quiz does a good job explaining potential solutions, starting around the 1:50 mark.