Hacker News Reader

Looks cool -- What does machete do when it hits a merge conflict that requires manual resolution?

It stops and asks you to resolve it and then you'd use the regular git commands to continue that operation (like git rebase --continue)