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 Branches and Merging Merging Merging Branches

Posted by okilydokily
okilydokily
12,105 Points

I wish I had know we were branching off of testing. That could have made more clear.

You'd taught us that in general we want to branch of master.

1 Answer

Rafael Castillo
.a{fill-rule:evenodd;}techdegree
Rafael Castillo
Front End Web Development Techdegree Student 10,301 Points

In this video/exercise you're not branching off of testing. You're creating a new branch (fix-nils) off of master. Rewatch the video starting at 1:23, he switches/checksout back to master from testing at that point before creating the new fix-nills branch and saving the corrections at that point.

Jason Anders
Jason Anders
Treehouse Moderator 145,860 Points
Jason Anders
Jason Anders
Treehouse Moderator 145,860 Points

Marked "Best Answer" to close thread, as answer provides correct information.

Jason ~Treehouse Moderator