I haven't used git-smart, but I read through the docs and it seems that at it's heart it does a rebase -p which won't ever try to see if a merge can succeed whe

I haven't used git-smart, but I read through the docs and it seems that at it's heart it does a rebase -p which won't ever try to see if a merge can succeed where a rebase conflicts.