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
Robert Mews
11,540 PointsConfirming Merge was Succesful
I was a little confused on how he confirmed the conflict merge commit at the end of the video. I'm assuming since he was in nano he hit save then exit and was brought to the command line in the console (the video must have had a jump cut).
So how can I confirm that the merge was successful?
2 Answers
William Li
Courses Plus Student 26,868 Pointsthe video must have had a jump cut
No the video doesn't have a jump cut. Did you notice that on the very last step, the command the instructor typed is git commit instead of git commit -a -m "commit massage"?
Whenever you commit with
git commit
the default editor (the one set by the git config --global core.editor setting) is open to let you type out a commit message; this is very useful when you need to write a long commit message; when you finish typing up the commit msg in the editor, save it, and the commit is done.
Ed Mendoza
9,652 PointsI recommend checking out this try.github.io it will take you directly to the merging portion of the git tutorial. Generally you will see a success message in your console if the merge was successful without any conflicts. But running through the try.github.io course will help explain it a lot better than I can.
William Li
Courses Plus Student 26,868 Pointsyep, all of CodeSchool's git courses are good stuffs.