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
Jonathan Musso
3,760 PointsResolve the first merge conflict by accepting the HEAD version of the conflict.
Hello. I tried removing the pessimistic_branch to accept the first HEAD version of the conflict.
Did not work.
Any ideas?
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.
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
Peter Hatzer
20,837 PointsPeter Hatzer
20,837 PointsHi Jonathan,
You are only looking to remove the the text between the head line like so:
this is determine which line of code you want to choose between your conflict.
Hope this helps,
Peter