Support cherry-picking with conflicts, an example output of git status follows:
On branch some-branch-name
You are currently cherry-picking commit 35b13a6.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: src/kyc_decisioning/topics/topics.py
no changes added to commit (use "git add" and/or "git commit -a")
Support cherry-picking with conflicts, an example output of
git statusfollows: