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 Nobody Tebulo
Nobody Tebulo
13,233 Points

Resolve the second merge conflict however you'd like. Oops! It looks like Task 1 is no longer passing.

Resolve the second merge conflict however you'd like.

Oops! It looks like Task 1 is no longer passing.

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.

It pretty much can't ever resolve problems.

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

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

1 Answer

Ari Misha
Ari Misha
19,323 Points
Ari Misha
Ari Misha
19,323 Points

Hiya there! In the second challenge , the challenge gave us a freedom to solve the merge conflict however we want to. But looks like you kept both branches' code. You cant keep both. Why? coz you're back to square one, right? 'coz you didnt actually solve the issue at all for servers and Git. So yeah either remove the lines from HEAD section or remove lines from pessimistic_branch. Do that and you're good to go. (: