Git Rebase
Explore how Git rebase helps you keep your branches up to date with the latest changes from the parent branch. Understand the process of rebasing, how it modifies commit history, and how to handle conflicts if they arise. This lesson teaches you to effectively manage and review your project history using Git logs and differentiate between rebase and merge strategies for better version control.
We'll cover the following...
The git rebase command
Rebasing is useful for making sure that the branch you are working on diverges from the latest version of the parent branch.
Let’s say you took out a new branch from master and continued working on it, adding new commits. During this time, the master branch ends up with new commits and updates from other contributors who merged their code with it. Your branch will seem a bit like this:
Ideally, you would want to make sure that the branch you have been working on links to the latest version of the parent branch. This concern is what rebasing will ...