msiemens / PyGitUp / 31373975301

89%

push

github

fix: verify the conflict resolver completed the rebase

Checking only for a leftover rebase-merge dir counted a resolver that
gave up via `git rebase --abort` as success. Check that the branch
contains the target instead, and don't run the resolver for rebase
failures that aren't conflicts.

27 of 29 new or added lines in 2 files covered. (93.1%)

514 of 577 relevant lines covered (89.08%)

13.07 hits per line