From: Scott Weaver <[email protected]> [redhat] ark-create-release.sh: use 3-way merge
There can be conflicts that the 3-way merge strategy can resolve when adding the Include in Releases MRs. Let 'git am' fall back to use the 3-way merge strategy if the patch does not initially apply. Signed-off-by: Scott Weaver <[email protected]> diff --git a/redhat/scripts/ci/ark-create-release.sh b/redhat/scripts/ci/ark-create-release.sh index blahblah..blahblah 100755 --- a/redhat/scripts/ci/ark-create-release.sh +++ b/redhat/scripts/ci/ark-create-release.sh @@ -23,7 +23,7 @@ MR_PATCHES=$(gitlab project-merge-request list --project-id="$PROJECT_ID" \ --labels="Include in Releases" --state=opened | grep -v "^$" | sort | \ awk '{ print "https://gitlab.com/cki-project/kernel-ark/-/merge_requests/"; $2 ".patch" }') for patch_url in $MR_PATCHES; do - curl -sL "$patch_url" | git am + curl -sL "$patch_url" | git am -3 done # if dist-release doesn't update anything, then there is a good chance the -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3016 -- _______________________________________________ kernel mailing list -- [email protected] To unsubscribe send an email to [email protected] Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/[email protected] Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
