Sign in to confirm you’re not a bot
This helps protect our community. Learn more

What's in today's episode

0:31

Recap - code, add, commit, push

2:11

Complexitives of coding in a team

5:44

Branches

10:43

Create, view, checkout and delete branches

13:01

Patterns for branching and merging

20:41

Process for branching and merging

24:02

Different idologies for merging

29:04

Practice merging between branches

33:26

Practice making a Pull Request

38:18

Practice handling merge conflicts

44:30

Working with forks

51:46

Fork a repo and make a PR back to the original

53:31

Git Blame

58:34

Git Stash - a shopping analogy

1:01:25

Git Stash commands

1:03:26

Practice git stash

1:04:21

Git Cherry Pick - a shopping analogy

1:05:10

Git Cherry Pick commands

1:06:24

Join our Cloud Skills Challenge

1:08:14

Coming up in the Reactor

1:11:18
In the Code Garden - GitHub for Students and Rising Developers - Ep 2
*Your Speaker* Renee is the Regional Cloud Advocate for the Sydney Reactor and the Australia region. She's passionate about technology, education, community, and bringing them all together in-person and online. As an avid learner and educator, she'd love to help you on your learning journey in a fun and friendly way. Join Renee to learn about Python, web dev, and data science, as she shares her knowledge and discoveries from her latest learning explorations. *Event Description* Getting started with version control can seem hard and unapproachable. But this month in the Code Garden you'll see why Git is as easy as a shopping trip 🤨🛒🧾 and we'll bring this analogy to life! Over 2 episodes I'll cover the principles behind version control and Git, why it's important, and how you can easily get started with GitHub by yourself and as part of a team. You learn what a git repo is, and how it can be utilized by teams to collaborate. We'll cover all the git essentials you need to know to get started, like committing code, pulling, and pushing. And we'll give you the skills and mindset you need to collaborate by telling you about branches, forks, resolving merge conflicts, and pull requests. In episode 2 this month we'll be taking your GitHub and Git skills to the next level to get you working as part of a team. We'll talk about branches, merging, pull requests and more. We'll discuss how these can be used in different ways to allow teams to collaborate, including ways that it creates opportunities to provide peer feedback and create a successful codebase as a team. 00:31 - What's in today's episode 02:11 - Recap - code, add, commit, push 05:44 - Complexitives of coding in a team 10:43 - Branches 13:01 - Create, view, checkout and delete branches 20:41 - Patterns for branching and merging 24:02 - Process for branching and merging 29:04 - Different idologies for merging 33:26 - Practice merging between branches 38:18 - Practice making a Pull Request 44:30 - Practice handling merge conflicts 51:46 - Working with forks 53:31 - Fork a repo and make a PR back to the original 58:34 - Git Blame 1:01:25 - Git Stash - a shopping analogy 1:03:26 - Git Stash commands 1:04:21 - Practice git stash 1:05:10 - Git Cherry Pick - a shopping analogy 1:06:24 - Git Cherry Pick commands 1:08:14 - Join our Cloud Skills Challenge 1:11:18 - Coming up in the Reactor *Additional Resources* https://aka.ms/CSCGitHubcollabREg1 [eventID:19014]

Follow along using the transcript.

Microsoft Reactor

114K subscribers
Live chat replay is not available for this video.