How would you resolve it, and how does this differ from resolving conflicts in a git merge?
It's similar, except that the conflict gets resolve by modifying the coding changes that are in one of the commits that is being rebased, rather than creating a separate merge commit.
