Skip to content

Commit

Permalink
Merge pull request #334 from nextcloud/nickvergessen-patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
skjnldsv authored May 17, 2022
2 parents 2022079 + 18c88d6 commit 8c6c655
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lib/backport.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ module.exports = async function (context, targets, logger) {
logger.debug('Checking conflicts', oldChanges, newChanges)
if (conflicts) {
logger.warn('Conflicts when cherry-picking from', oldBranch, 'to branch', branch)
await pullRequest.updatePRBody(context, newPrId, `:warning: This backport had conflicts and is incomplete :warning:\n\nbackport of #${pr.data.number}`)
await pullRequest.updatePRBody(context, newPrId, `- [ ] :warning: This backport had conflicts and is incomplete\n\nbackport of #${pr.data.number}`)
}

// Set available milestone
Expand Down

0 comments on commit 8c6c655

Please sign in to comment.