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
Garrett Carver
14,681 PointsMerge Conflict in last part of the video
So I am confused about when Kenneth pushed his 'bootstrap' branch from his local machine to Github and then did a pull request to merge it with master, but Andrew couldn't merge it because there was a merge conflict. Where did the conflict occur exactly and what did he do to fix it?
Did Kenneth go back to his local machine, merge with master, fixed merge conflicts with master locally, then push local-master back to the bootstrap branch, and request another pull request? If so, why would that be necessary? Also, what if Andrew rejected some or all of those changes, how would that be handled?
Alex Hernandez
Courses Plus Student 1,936 PointsHe didn't pull and commit that's why he didn't see the conflict before. He just tried to solve by hand before the conflict.
Stephen Emery
14,384 PointsStephen Emery
14,384 PointsIt's hard to say what the specific error was, but Kenneth did much the same as Andrew did at 10:50 minutes into the video. When Kenneth tried to merge, there would have been a conflict error message. I'm guessing he missed it while they were talking. So he went back into terminal and fixed the errors in his text editor VIM.
After he fixed the error, he probably committed it to his branch, merged it again to the local master, and then did a push.