Up and Running with Git Transcripts
Chapter: Introducing Git
Lecture: What will we cover?
0:00 Let's say just a moment and talk about what we're going to cover throughout this course
0:03 We've already begun this conversation but we're going to dive deep into it in the
0:09 beginning, why do we want to use git?
0:11 And what is Version Control Software?
0:14 What advantages does it bring for us and so on.
0:17 I wanna explore this a little bit more.
0:20 We're going to talk about what I'm referring to as the 6 Core.
0:24 git commands. That's right. six,
0:26 that's it. The entire course only needs to teach you six things and you will
0:31 be very, very productive with git. Now I've bundled a couple of these together,
0:37 for example, a git pulled to get new updates and they get pushed to get
0:42 push those changes back. I've kind of group those into one core command in my
0:46 mind. So you might say they're actually 10 things you could move over to typing
0:51 on the terminal if you went down that path,
0:53 but there's only a handful of commands that I'm group those into six areas that we're
0:57 going to focus on to do our work with git.
1:00 We're gonna talk about treating and modifying a git repository.
1:04 We can create these both locally or in some hosted location.
1:08 Like github or gitlab.
1:10 We're going to then focus on teamwork.
1:12 Now Teamwork. You want to think of this from various perspectives if you're on
1:16 a team that's applies to you.
1:18 If you're not on a team,
1:19 it may well be different use cases and different scenarios.
1:24 But just for you, for example,
1:26 if I have my desktop here and I work on some code and I push it
1:29 to source control. And other than I go on my laptop,
1:33 I want to get those changes.
1:34 Well, that's kind of scene from git perspective as two different people,
1:38 two different systems that need to synchronize and so on.
1:42 So the same ideas that we talk about,
1:43 same merging here, that's for teams.
1:46 It could also just be your working into systems or even if I need to go
1:50 back and fix a bug and then go forward in time,
1:52 it could be you and in place or it could be you in time in different
1:55 ways. So even if you're just by yourself,
1:57 these teamwork things absolutely apply to you.
2:00 So we're gonna talk about merging code that is taking code changed in two different places
2:05 often by two different people and then putting them back together.
2:09 Sometimes this is automatic, but other times there's merge conflicts and how do you deal
2:14 with that? We're going to talk about branching.
2:17 Right. When I introduced what is vcs,
2:19 what is source control? We saw those little colored branches going off and I talked
2:24 about parallel development. Like how do we go back in time and split off to
2:28 fix a bug without affecting the future.
2:31 That's branching. We'll talk way more about it as we get to that section and
2:35 then we're going to talk about some more advanced workflows with this idea of a pull
2:41 request. While not technically a git concept is the more I github idea.
2:47 It's a very useful way in which people contribute to modern open source software.
2:52 It's also a thing that certain teams have adopted to group their work into larger,
2:58 more understandable units of change as their application changes.
3:02 So even if you're not contributing to open source,
3:04 this is something you want to know about.
3:06 And finally, we're going to talk about some tips and how you might fix mistakes
3:10 if you run into issues like that.
3:12 Some cool little tools and other things like that.
3:15 So this is really fun section to round out the course.
3:18 So here it is, we're going to basically focus on what is source control and
3:22 why do you care? What are the six core things you need to know to
3:25 use git? And then how do you do that as a team?
3:28 It's gonna be a lot of fun.