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

Arvind Kevin Arjun Sharma
Arvind Kevin Arjun Sharma
8,272 Points
Posted by Arvind Kevin Arjun Sharma
Arvind Kevin Arjun Sharma
8,272 Points

Who can help me with the answer for this? i really don't know what to do in this task.

I wanna see the answer so i can see what i don't understand in this case.

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.

<<<<<<< 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

Abraham Juliot
Abraham Juliot
47,353 Points
Abraham Juliot
Abraham Juliot
47,353 Points 
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.

Maybe you can help it resolve its issues?