From dac44ec2e083b0a5c42dc2d046e0eb5a9003cd14 Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Thu, 11 Mar 2021 10:50:06 -0700 Subject: [PATCH] feat(update-vscode): use todo items for conflicts in pr body --- ci/dev/update-vscode.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/dev/update-vscode.sh b/ci/dev/update-vscode.sh index 0c05a4904..3afec387d 100755 --- a/ci/dev/update-vscode.sh +++ b/ci/dev/update-vscode.sh @@ -98,8 +98,8 @@ main() { git subtree pull --prefix lib/vscode vscode release/"${VSCODE_VERSION_TO_UPDATE}" --squash || true # Get the files with conflicts before we commit them - # so we can list them in the PR body - CONFLICTS=$(git diff --name-only --diff-filter=U | while read -r line; do echo "- $line"; done) + # so we can list them in the PR body as todo items + CONFLICTS=$(git diff --name-only --diff-filter=U | while read -r line; do echo "- [ ] $line"; done) PR_BODY=$(make_pr_body "$VSCODE_EXACT_VERSION" "$CONFLICTS") echo -e "\nForcing a commit with conflicts"