Skip to content

Commit

Permalink
hotfix/append conflicts instead of replacing pr body
Browse files Browse the repository at this point in the history
Signed-off-by: Nicolas Drebenstedt <[email protected]>
  • Loading branch information
cutoffthetop authored Mar 12, 2024
1 parent e562a36 commit a3eb747
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ jobs:
cruft update --skip-apply-ask
printf '# Changes\n\n- bumped cookiecutter template to %s/commit/%s\n' "$template_url" "$template_ref" > .cruft-pr-body
if [[ $(find . -type f -name "*.rej" | wc -l) -ne 0 ]]; then
printf '\n# Conflicts\n' > .cruft-pr-body
printf '\n# Conflicts\n' >> .cruft-pr-body
fi
find . -type f -name "*.rej" | while read -r line ; do
printf '\n```' >> .cruft-pr-body
Expand Down

0 comments on commit a3eb747

Please sign in to comment.