Add an "advanced merge" option that will try and take any remapped paths into account
If git cherry-pick doesn't have a conflict, we dont need to "record" the merge as "git cherry" will detect it