Up and Running with Git Transcripts
Chapter: Teamwork: Merging
Lecture: Getting everyone back in sync

Login or purchase this course to watch this video and the rest of the course contents.
0:00 Here we are back in. Windows are developer has stepped away from their desk. Maybe they were working on their
0:07 TPS reports. I don't know but recall that visual studio code said hey I would like to just periodically keep an eye on what might be happening with
0:17 regard to the remote repository notice right here that I do not have the changes about the template. Right. I've got my changes,
0:27 I've done the jokes and stuff but we're still in line rendering all of that and if I go over to the source code stuff you don't see too much going on
0:37 But look down a little bit right there. See those 3 down 0 up funny web git pull three commits from origin/main This is where that pulling shows up.
0:50 It says look there's some stuff you could work on here, you could synchronize so I just click that and boom check out my code has changed
0:57 We have flask render template. If I expand this again we have the templates folder,
1:02 we have our joke right there and we still have our data and we still have our app.py we also got a little the cleanup that I did.
1:10 So let's see if I go right here, here we go. We got a scroll over I guess Michael Kennedy 18 minutes ago added the HTML template for the joke.
1:20 Whereas over here we finished the new data layer so you can see it's brought those changes together and now we have zero and zero.
1:28 Let's just do a quick run just to make sure everything's hanging together. Sure enough, we have it still working.
1:37 We could zoom a little and we've even picked up the changes the other developer added on, so very good, very good.
1:45 Let's see relationship status. I'll leave the relations to the database. Very nice. So incredibly easy to keep in sync. And the little VS code thing.
1:55 The little pulling is quite nice actually, by the way, this also does that you can see it has its three items
2:02 that it could pull over. It takes a moment to realize, you know, that we actually did that over in another tool,
2:08 but a source tree also does that periodically. Pulling we didn't ask it to do. So I hit fetch. This will sort of refresh it.
2:17 And this is actually no, you know what we're in sync. Forget it. That's kind of just kind of like refresh that status for you.
2:23 Okay, So now both of the developers are once again exactly in sync.

Talk Python's Mastodon Michael Kennedy's Mastodon