FIX: write errors to stderr
IMPL: do not crash in case of conflicts
FIXUP: mistype fixed
FIX: handle fastforward merge also
FIX: also handle failure in continue
gh-7: fix cases visible in tests

The only place which is not fixed is `marks_cleared`.
This should be fixed by implementing TODO analysis.