Is there any difference between the number of conflicts when doing merge to a branch as opposed to rebase a branch? why is that?
When doing a merge the
