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 Basics Merging Simple Merges

Abe Layee
Abe Layee
8,378 Points
Posted by Abe Layee
Abe Layee
8,378 Points

I need help with this. I don't understand what I am being asked to do

Now that you've committed your last change, your work on this branch is finished. We need to merge it into the master branch. The first step is to checkout master I tried git checkout -m rewrite_new_page but is the wrong command for the challenge.

4 Answers

Kevin Korte
Kevin Korte
28,149 Points
Kevin Korte
Kevin Korte
28,149 Points

First you just need to checkout the master branch, since in the step before you committed the brach. To do that, you just need to use git checkout master.

My favorite article to remind me how to do this stuff: https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging

Abe Layee
Abe Layee
8,378 Points
Abe Layee
Abe Layee
8,378 Points

I thought the git checkout -m is the same as git checkout master? I am trying to wrap my head around this Git stuff.

Kevin Korte
Kevin Korte
28,149 Points
Kevin Korte
Kevin Korte
28,149 Points

Not that I'm aware of. The -m would be a flag, used to indicate the message on a git commit

Abe Layee
Abe Layee
8,378 Points
Abe Layee
Abe Layee
8,378 Points

Thank you very much.