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
Hannah Flynn
21,429 Points"Simple merges": task 4
"There's a second branch you were working on, rewrite_about_page, that also needs to be merged into master, you just needed to merge rewrite_main_page first. Now that that's done, go ahead and merge rewrite_about_page into master too." can you help me by showing the correct code?
3 Answers
John Steer-Fowler
Courses Plus Student 11,734 PointsHi again Hannah,
It's literally exactly the same process as the challenge step 3 (the one before this one).
git merge rewrite_about_page
It's all explained in the video
Hope this helps
Ryan Nelson
4,534 Pointsgit merge rewrite_main_page
John Steer-Fowler
Courses Plus Student 11,734 PointsHi Hannah,
The video previous to the code challenge "Basic Merging" explains everything you need to know.
Unfortunately I cannot provide you with the answers, as this will not help your learning at all.
All I can recommend is re-watch the video and try again, all the information is there
Hannah Flynn
21,429 PointsSorry, but I can't find anything in the "Basic Merging" video for task 4. Please show me the correct code.