Edit code through branching and merging in Git
Level up your Git knowledge by learning how to keep code separate in branches, and how to merge them later.
Learning objectives
In this module, you will:
- Learn how branches work in Git
- Create new branches and switch between branches
- Merge branches together
- Learn basic techniques for resolving merge conflicts
Prerequisites
A basic knowledge of working with Git, including:
- Terms like repository, working tree, and index
- Creating repos
- Staging and committing changes
- Resetting and reverting from simple mistakes
- Cloning repositories
- Pull requests
- Stashing changes
- Pushing changes and updating your repo by pulling