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

Posted by Darwin Zone
Darwin Zone
7,303 Points

How to resolve the first merge conflict by accepting the HEAD version of the conflict.

I'm having trouble figuring out the correct way to accept a specific block of a conflicted file, please help me do it properly.

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.

1 Answer

Victor Ruiz
Victor Ruiz
16,570 Points
Victor Ruiz
Victor Ruiz
16,570 Points

Hi Javier,

So what the challenge is asking is to remove the conflict which is the line for pessimistic_branch. Sorry this didn't get answer before.

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.

<<<<<<< HEAD
Maybe you can help it resolve its issues?
=======
But it's a very needy file, so people often leave it alone.
>>>>>>> pessimistic_branch