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
Ann Boen
Courses Plus Student 18,089 PointsGit Merging - I don't g(i)t (get) it!
Can anyone tell me what I am supposed to be doing in this challenge, because I totally don't get the picture....
3 Answers
Roberto Alicata
Courses Plus Student 39,959 PointsI made this video, tell me if it is more clear
Roberto Alicata
Courses Plus Student 39,959 PointsYou must accept only the lines beetween the "<<<<<<< HEAD" and "=======" and discard the lines beetween "=======" and ">>>>>>> pessimistic_branch"
You have to get this:
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.
Maybe you can help it resolve its issues?
Ann Boen
Courses Plus Student 18,089 PointsYes I got that so far, but I can't seem to solve this one. I've watched the episode over and over again and still I can't answer this one.
Ann Boen
Courses Plus Student 18,089 PointsOMG I thought I had to run some Git commands, I was thinking waaaaay to far... while it was so simple :-S Thx Roberto!