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!
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
2 part question. Does merging merge branches only or whole repos? Also when I tried to push back our_clone at the end..
of the lesson I got a fatal error and that the recommendation was to use git push --set-upstream our_clone master
Is that correct that we are pushing the master branch? I wasn't sure.
Jay McGavrenTreehouse Teacher
git merge merges one branch only. If you want to merge other remote branches, you'll need to do so individually.
git push attempts to push whatever branch you currently have checked out, so if
master is checked out, that's what will be pushed. If
master is not set as a tracking branch, then you would get that error; adding the
--set-upstream option should fix it.
A more thorough explanation of how merging works will be part of our upcoming Git Branches and Merging course, which is releasing later this month.