Skip to content

Commit abd73fe

Browse files
authored
better comment in case of backport failure (#82)
Fixes #81
1 parent 1437aad commit abd73fe

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

src/backport.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,14 @@ const parseCandidate = async (candidate, giteaVersion: GiteaVersion) => {
4848
if (!success) {
4949
await addPrComment(
5050
originalPr.number,
51-
`I was unable to create a backport for ${giteaVersion.majorMinorVersion}. @${originalPr.user.login}, please send one manually. :tea:`,
51+
`I was unable to create a backport for ${giteaVersion.majorMinorVersion}. @${originalPr.user.login}, please send one manually. :tea:
52+
53+
\`\`\`
54+
go run ./contrib/backport ${originalPr.number}
55+
... // fix git conflicts if any
56+
go run ./contrib/backport --continue
57+
\`\`\`
58+
`,
5259
);
5360
await addLabels(
5461
originalPr.number,

0 commit comments

Comments
 (0)