3 ms·
Looks cool -- What does machete do when it hits a merge conflict that requires manual resolution?
by Tempest1981 3y ago
Looks cool -- What does machete do when it hits a merge conflict that requires manual resolution?
- _ikke_ 3y agoIt stops and asks you to resolve it and then you'd use the regular git commands to continue that operation (like git rebase --continue)