> […] ensures the branch about to be merged has no conflicts with the one being merged to So does merging. > or that conflicts have been fixed in the branch p

> […] ensures the branch about to be merged has no conflicts with the one being merged to So does merging. > or that conflicts have been fixed in the branch prior to the merge Conflicts that show up in rebasing may not necessarily show up during a merge. Having to fix a bunch of conflicts that only occur because you rebased is tedious and introduces a source of potential error.