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 and scale concurrent work on your codebase. Branches are also great to organize your daily tasks and manage what you're doing on your own machine. In this course, Working with Git Branches, you'll gain the ability to incorporate branches into your daily workflow. First, you will learn the basics of branches. Next, you will discover how to diff and merge branches, along with how to understand, avoid, and deal with code conflicts when they come up. You will see how to use remotes and pull requests to collaborate as a team. Finally, you will explore 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.