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 Lesson: Resolve the second merge conflict however you'd like

I have no idea what I am supposed to do here. I don't see a second merge conflict or I already deleted it in the first part, I am very confused. Help

^.,.^

Cat

Maciej Czuchnowski
Maciej Czuchnowski
36,441 Points

Can you be a little bit more specific? I have no idea what you are referring to exactly :)

1 Answer

Kevin Fitzhenry
Kevin Fitzhenry
30,096 Points

Catherine Brooks you likely removed both merge conflicts in the first part of the challenge. Therefore, the second task will pass if you hit "Check work"

great indeed, thaanx kevin

kelvin you just a brainiac