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
John Falato
1,885 PointsI'm in "https://teamtreehouse.com/library/conflict-resolution" and the editing function is not working.
I'm using Chrome browser on a windows 10 laptop. When I try to edit the file I am thrown back to the previous section.
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
2 Answers
Steven Parker
231,269 PointsIt doesn't look like you've edited anything in the file above. What changes did you make?
I tried the challenge myself and was able to pass both tasks.
John Falato
1,885 PointsThe problem was, I could not edit the file. When I clicked on the page to set the cursor I was sent back to the previous page. I retried doing it using the IE browser, and it worked, but there are other problems with IE.
Thanks for the reply.