Skip to content

Commit dac44ec

Browse files
committed
feat(update-vscode): use todo items for conflicts in pr body
1 parent e79ca99 commit dac44ec

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

ci/dev/update-vscode.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ main() {
9898
git subtree pull --prefix lib/vscode vscode release/"${VSCODE_VERSION_TO_UPDATE}" --squash || true
9999

100100
# Get the files with conflicts before we commit them
101-
# so we can list them in the PR body
102-
CONFLICTS=$(git diff --name-only --diff-filter=U | while read -r line; do echo "- $line"; done)
101+
# so we can list them in the PR body as todo items
102+
CONFLICTS=$(git diff --name-only --diff-filter=U | while read -r line; do echo "- [ ] $line"; done)
103103
PR_BODY=$(make_pr_body "$VSCODE_EXACT_VERSION" "$CONFLICTS")
104104
105105
echo -e "\nForcing a commit with conflicts"

0 commit comments

Comments
 (0)