A sample repository for dealing with a conflict during git rebase
We have to branches, main and branch. We want to take the changes that were introduced by branchand apply them on main by git rebase.
Three commits exist from the common ancestor of the two branches. Therefore, git rebase main from branch will apply three patches, and consequently, three commits. However, during the rebasing, the procedure is stopped because of some conflicts.
You have to resolve the conflict and complete the rebasing proceduer.
git switch -c branch origin/branch
git rebase mainCC0