diff --git a/lib/git.js b/lib/git.js
index cc40f57d..c2514889 100644
--- a/lib/git.js
+++ b/lib/git.js
@@ -46,6 +46,11 @@ module.exports = async function (context, token, commits, target, logger) {
         ])
       } catch (error) {
         conflicts = true
+        logger.error('Cherry-pick failed. Abort and try with --strateg-option=ours', error)
+        await git.raw([
+          'cherry-pick',
+          '--abort',
+        ])
 
         await git.raw([
           'cherry-pick',