Up and Running with Git Transcripts
Chapter: The '6' core git operations
Lecture: Branch, checkout, and merge
0:00 The final group set of commands.
0:02 The final command here is branch and check out as well as emerge here.
0:07 We are in source tree looking at the history of this project. Over on the side
0:13 You can see there are branches,
0:15 these are the parallel development, you know,
0:17 I want to split off work on this feature until I get it totally polished and
0:20 then we can bring it back into the main line and so on.
0:24 So we have this locally. These are branches,
0:26 we have already checked out and we create them through using the branch keyword and then
0:31 we activate them using check out.
0:33 You can see them visualized here with different colors and you can also,
0:37 if you expand that over on origin,
0:39 these are the ones that exist on github.
0:41 There might be more than the ones we have locally or even when we might have
0:44 local ones. We've yet to push back to github.
0:48 And finally, if you take changes from somewhere else,
0:51 some other branch and you bring them into your branch.
0:53 Often if there's any files that have been edited in both scenarios,
0:57 those have to be merged. In fact,
0:59 that also happens when you do a pull back from git hub.
1:03 If someone else has also made a change to that branch that you're actively on.
1:08 We're going to focus a lot on these three things towards the end of the course more we get into team work section.