Managing Conflicts When Rebasing
What happens if the rebase operation runs into conflicts? Let's take a look.
We'll cover the following...
In the previous lesson, we discussed what rebasing does and also tested out a scenario where we were able to carry out and observe a successful rebase operation.
However, it’s not all that simple.
Why conflicts can occur when rebasing
What if you decided to rebase your branch with the latest version of the parent branch, which contains new commits that have changed the same files at the same location within those files where you have also included your changes?
Do note that when a rebase is carried out, it takes place commit by commit. Therefore, what would happen if one of the parent branch’s commit conflicted ...