You'll notice
The sync-blocked warning now also covers cherry-pick, revert and stash pop, telling you to resolve or abort.
The warning shown when a repo can't be captured due to an in-progress Git operation now covers cherry-pick, revert, and stash pop in addition to merge and rebase, and tells the user to resolve or abort that operation.