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 Introduction to Merging

Simon Coates
Simon Coates
28,694 Points

How does merging work?

Merging is just merging at the end point (the new commit), right? the commits from the branches are unaltered? Does this pollute the master branch, so between checkouts presented in a linear history files, changes, might disappear and reappear? (unless i'm missing something or horribly mistaken, that sounds like it would create an unusable history)

1 Answer

Victor Cuc
Victor Cuc
7,281 Points

Watch the next video.