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

Development Tools Git Basics Merging Conflict Resolution

Richard Lake
Richard Lake
20,462 Points
Posted by Richard Lake
Richard Lake
20,462 Points

Challenge impossible

It is not possible to complete this task, at Step One the HEAD and <<<< branch markers where there so I completed that task leaving the HEAD branch in place as instructed so I go to step two.

At step two it made no sense what I was supposed to do so I am ended up at Step one.. but no markers at all so unable to recomplete Step One!

Please can you mark this challenge as complete so I can continue with the Course, thank you.

conflicted_file.txt 
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.

It tries its best to resolve problems on its own.


Whenever it runs into a problem, it asks other people for help.

1 Answer

Richard Lake
Richard Lake
20,462 Points
Richard Lake
Richard Lake
20,462 Points

Err, well that was weird managed to get a Restart button to appear and I pressed CTRL+Z on the keyboard and miraculously the code came back! Challenge makes no sense.