From 4fed99722ae85c403587c07d09e715f239cb8c55 Mon Sep 17 00:00:00 2001
From: Nico Korthout <nicokorthout@gmail.com>
Date: Tue, 7 Nov 2023 21:23:58 +0100
Subject: [PATCH] fix: instruct to resolve conflicts

When the cherr-picking failed, it's very likely that there are
conflicts. We should instruct the user to cherry-pick locally and
resolve any conflicts.
---
 src/backport.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/backport.ts b/src/backport.ts
index 5b4b8b3..79dd41d 100644
--- a/src/backport.ts
+++ b/src/backport.ts
@@ -404,7 +404,7 @@ export class Backport {
     );
     return dedent`Backport failed for \`${target}\`, ${reason}.
 
-                  Please cherry-pick the changes locally.
+                  Please cherry-pick the changes locally and resolve any conflicts.
                   ${suggestion}`;
   }