From the course: Version Control for Everyone

Unlock the full course today

Join today to access over 22,600 courses taught by industry experts or purchase this course individually.

Merging when work is ready

Merging when work is ready - GitHub Tutorial

From the course: Version Control for Everyone

Start my 1-month free trial

Merging when work is ready

“

- [Instructor] In this video, we're going to take a look at merging branches, which is how a separate line of work or thought is brought into another. In our case, that's generally going to be a branch off of master being merged back into the master branch. Before we get into this, it's worth mentioning that you don't have to merge necessarily. If you're just happy making branches and working that way, and everything that you're doing is totally separate, nobody's saying you have to do it, but most of the time, when we're thinking about our work, there's a main line, which we refer to as master most of the time, which is the work that we're going to be sharing with the world, whenever we're finished. And so these branches could be considered the pieces that we're working on separately that we hope will eventually be brought back in when we think yeah, this thing that I was working on is done. There's different kinds of…

Contents