Git Branching and Merging

Git branches help you manage your daily tasks easier. If you're working in a shared codebase, then branching is essential. Packed full of demos, this course will guide you through Git branches and the tools available to help you along the way.

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

• Course Overview 1min
• Understanding Git Branch Basics 32mins
• Merging Made Easy 39mins
• Using Git Branches with Your Team 37mins
• Advanced Merging Methods 31mins