Skip to content

Commit

Permalink
fix: instruct to resolve conflicts
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
korthout committed Nov 7, 2023
1 parent 3e20570 commit 4fed997
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/backport.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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}`;
}

Expand Down

0 comments on commit 4fed997

Please sign in to comment.