Git Branching and Merging

Focused View

Craig Golightly

2:22:43

71 View

1. Course Overview

1. Course Overview.mp4

01:33

2. Understanding Git Branch Basics

1. About This Course.mp4

04:54

2. Branching In-flight.mp4

05:16

3. Moving from Branch to Branch.mp4

14:14

4. Renaming and Deleting Branches.mp4

08:01

3. Merging Made Easy

1. Comparing and Merging Branches.mp4

05:48

2. Understanding Git Diff.mp4

03:37

3. Using Git Diff.mp4

15:31

4. Resolving Merge Conflicts.mp4

08:04

5. Aborting a Merge.mp4

06:34

4. Using Git Branches with Your Team

1. Setting up Remotes.mp4

04:45

2. Using Remotes with Code.mp4

05:35

3. Using Remotes with Branches.mp4

06:00

4. Using Pull Requests.mp4

07:18

5. Ignoring Files.mp4

05:31

6. Setting Team Conventions.mp4

04:07

7. Creating Code That Can Merge.mp4

04:36

5. Advanced Merging Methods

1. Rearranging with Rebase.mp4

02:59

2. Squashing Multiple Commits.mp4

05:16

3. Rebasing from Main.mp4

08:50

4. Using Cherry Pick.mp4

03:50

5. Cherry Pick Demos.mp4

08:41

6. Conclusion.mp4

01:43

Description

Git branches help you manage your daily tasks easier. If you're working in a shared codebase, then branching is essential. Packed full of demos, this course will guide you through Git branches and the tools available to help you along the way.

What You'll Learn?

Working in a large, shared codebase is complex. How do you make progress when everyone is working at the same time? Git branches help you organize your daily tasks, scale concurrent work in your codebase, and manage what you're doing on your own machine. In this course, Git Branching and Merging, you'll gain the ability to incorporate branches into your daily workflow. First, you'll learn the basics of branches. Next, you'll discover how to diff and merge branches, along with how to avoid and deal with code conflicts when they come up. Then, you'll see how to use remotes and pull requests to collaborate as a team. Finally, you'll learn when to use rebase and cherry-pick. When you're finished with this course, you will have the skills and knowledge of Git branching needed to boost your individual productivity, work as a team, and lower your stress level.

More details

User Reviews

Rating

average 0

Total votes0

Focused display

Software Engineering

Git

Craig Golightly

Instructor's Courses

Craig is passionate about solving problems with the right tools. He has over 20 years of software development experience with large enterprises and small startups on everything from search engines to fighter jets. He has a bachelor's and master's degree in computer science with extensive experience in AWS, microservices, and artificial intelligence. Craig enjoys teaching and mentoring others so they can save time and accomplish their goals faster.

Pluralsight

View courses Pluralsight

Pluralsight, LLC is an American privately held online education company that offers a variety of video training courses for software developers, IT administrators, and creative professionals through its website. Founded in 2004 by Aaron Skonnard, Keith Brown, Fritz Onion, and Bill Williams, the company has its headquarters in Farmington, Utah. As of July 2018, it uses more than 1,400 subject-matter experts as authors, and offers more than 7,000 courses in its catalog. Since first moving its courses online in 2007, the company has expanded, developing a full enterprise platform, and adding skills assessment modules.