Git: Branches, Merges, and Remotes

Course details

Git—the popular and free version control software—unlocks powerful code management tools, including branching, merging, and remote repositories. The course explains how to use these features and commands for change tracking and collaboration. Learn to navigate the commit tree and review the log to find specific commits. Find out how to create branches to test new ideas without impacting the main project and merge those changes into the project if they work out. You can also reset branches to undo changes and stash changes that are not ready to be committed in temporary storage. Instructor Kevin Skoglund also shows how to set up a remote repository to work with another developer and implement a collaboration workflow to ensure you are working together effectively.

Learning objectives
Finding and viewing commits
Creating and switching branches
Comparing branches
Resetting branches
Merging branches
Stashing uncommitted changes
Setting up a remote repository
Creating remote branches
Fetching and pushing changes to a remote
Enabling remote collaboration

Concepts

0. Introduction

01 - Unlock powerful code management and collaboration tools in Git
02 - What you should know

1. Navigate the Commit Tree

03 - Reference commits
04 - Ancestry
05 - Tree listings
06 - Filter the commit log
07 - Format the commit log

2. Branching

08 - Branching overview
09 - Create branches
10 - Switch branches
11 - Create and switch branches
12 - Switch branches with uncommitted changes
13 - Compare branches
14 - Rename branches
15 - Delete branches
16 - Configure command prompt

3. Reset Branches

17 - Reset types
18 - Soft reset
19 - Mixed reset
20 - Hard reset

4. Merge Branches

21 - Merge code
22 - Fast-forward merge vs. true merge
23 - Merge conflicts
24 - Resolve merge conflicts
25 - Strategies to reduce conflicts

5. Stash Changes

26 - Save changes in the stash
27 - View stashed changes
28 - Retrieve stashed changes
29 - Delete stashed changes

6. Set Up a Remote

30 - Local and remote repositories
31 - Set up a GitHub account
32 - Add a remote repository
33 - Create a remote branch
34 - Clone a remote repository
35 - Track remote branches

7. Collaborate with a Remote

36 - Push changes to a remote repository
37 - Fetch changes from a remote repository
38 - Merge in fetched changes
39 - Check out remote branches
40 - Push to an updated remote branch
41 - Delete a remote branch
42 - Enable collaboration
43 - Collaboration workflow

Conclusion

44 - Next steps