Git: Branches, Merges, and Remotes

Git: Branches, Merges, and Remotes
Git: Branches, Merges, and Remotes
English | MP4 | AVC 1280×720 | AAC 48KHz 2ch | 3h 07m | 554 MB

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.

Topics include:

  • 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
Table of Contents

1 Unlock powerful code management and collaboration tools in Git
2 What you should know
3 Reference commits
4 Ancestry
5 Tree listings
6 Filter the commit log
7 Format the commit log
8 Branching overview
9 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
17 Reset types
18 Soft reset
19 Mixed reset
20 Hard reset
21 Merge code
22 Fast-forward merge vs. true merge
23 Merge conflicts
24 Resolve merge conflicts
25 Strategies to reduce conflicts
26 Save changes in the stash
27 View stashed changes
28 Retrieve stashed changes
29 Delete stashed changes
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
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
44 Next steps