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

codebully
codebully
2,306 Points
Posted by codebully
codebully
2,306 Points

It's a bit unclear what the author wants here.

How? What? Where?!

1 Answer

Jason Anello
Jason Anello
Courses Plus Student 94,610 Points

Hi Nikita,

Task 1 is for these lines:

<<<<<<< HEAD
It tries its best to resolve problems on its own.
=======
It pretty much can't ever resolve problems.
>>>>>>> pessimistic_branch

Git doesn't know how to merge those two lines from the different branches. Should it keep the head version? Or the "pessimistic_branch" version? Or do you want to combine those two lines somehow?

In this case, task 1 is telling you to accept the HEAD version. This means you want to delete everything but the line of text in the HEAD branch.

It tries its best to resolve problems on its own.