Next lesson playing in 5 seconds

Overview
Transcript

1.1 Introduction

In this course, I'll teach you all about the differences between the Git merge and rebase commands. You'll learn that merge is best used for branches that are already public, and rebase is best for local private branches.

1.Git Basics: Merge and Rebase
2 lessons, 03:57

1.1
Introduction
00:31

1.2
Git Basics: Merge and Rebase
03:26

1.1 Introduction

Integrating changes from one branch into another can happen either through a merge or a rebase. A merge preserves the branch history. A rebase doesn't. A merge is useful for combining branches that are already public. A rebase is for combining private branches, never for public ones. What should be communicated clearly to begin. Is the simple fact that both merging and rebasing are about integrating new work. New commits that are on separate branches. That's it. In all of this there will always be at least two branches in play.

Back to the top