Overview
-
Learn how to use the branching, merging, and remote features of Git for code management and collaboration.
Syllabus
-
Introduction
- Unlock powerful code management and collaboration tools in Git
- What you should know
- Reference commits
- Ancestry
- Tree listings
- Filter the commit log
- Format the commit log
- Branching overview
- Create branches
- Switch branches
- Create and switch branches
- Switch branches with uncommitted changes
- Compare branches
- Rename branches
- Delete branches
- Configure command prompt
- Reset types
- Soft reset
- Mixed reset
- Hard reset
- Merge code
- Fast-forward merge vs. true merge
- Merge conflicts
- Resolve merge conflicts
- Strategies to reduce conflicts
- Save changes in the stash
- View stashed changes
- Retrieve stashed changes
- Delete stashed changes
- Local and remote repositories
- Set up a GitHub account
- Add a remote repository
- Create a remote branch
- Clone a remote repository
- Track remote branches
- Push changes to a remote repository
- Fetch changes from a remote repository
- Merge in fetched changes
- Check out remote branches
- Push to an updated remote branch
- Delete a remote branch
- Enable collaboration
- Collaboration workflow
- Next steps
