From a3eb74737274b4c114a85b5a816ff0f11eac4f7e Mon Sep 17 00:00:00 2001 From: Nicolas Drebenstedt Date: Tue, 12 Mar 2024 17:32:23 +0100 Subject: [PATCH] hotfix/append conflicts instead of replacing pr body Signed-off-by: Nicolas Drebenstedt --- .../.github/workflows/cookiecutter.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mex-{{ cookiecutter.project_name }}/.github/workflows/cookiecutter.yml b/mex-{{ cookiecutter.project_name }}/.github/workflows/cookiecutter.yml index 39f351e..f9b6b01 100644 --- a/mex-{{ cookiecutter.project_name }}/.github/workflows/cookiecutter.yml +++ b/mex-{{ cookiecutter.project_name }}/.github/workflows/cookiecutter.yml @@ -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