forgejo/.forgejo/workflows
Earl Warren ffdba30a62
[CI] backport strategy must fail when it conflicts
strategy: ort

The strategy is changed from "recursive" to "ort", which is the
default for git >= 2.43.2 and claims to reduce the likelyhood of
conflicts according to man git-merge:

> This has been reported to result in fewer merge conflicts without
> causing mismerges...

strategy-option: find-renames

The default option are the same for both strategies and "theirs" will:

> This option forces conflicting hunks to be auto-resolved
> cleanly by favoring their version.

"their" being whatever is not in the commits being cherry-picked.

In the context of Forgejo backports, this is not what is desired:
whenever a conflict happens it needs to be manually resolved and
prefering whatever is in the stable branch will not lead to a sane
backport.

It is changed back to "find-renames" which is documented to be the
default:

> Turn on rename detection, optionally setting the similarity
> threshold. This is the default.

Fixes: https://codeberg.org/forgejo/forgejo/issues/2886
2024-03-30 10:34:23 +01:00
..
backport.yml [CI] backport strategy must fail when it conflicts 2024-03-30 10:34:23 +01:00
build-release-integration.yml Disable duplicate builds 2024-03-25 13:24:53 +01:00
build-release.yml go: upgrade to go v1.22 2024-03-25 06:52:23 +01:00
cascade-setup-end-to-end.yml [CI] simplify end-to-end test cascading PR 2024-03-20 18:16:56 +01:00
e2e.yml go: upgrade to go v1.22 2024-03-25 06:52:23 +01:00
mirror.yml [CI] mirror to forgejo-integration daily instead of each commit 2024-02-17 11:55:52 +01:00
publish-release.yml go: upgrade to go v1.22 2024-03-25 06:52:23 +01:00
renovate.yml Update ghcr.io/visualon/renovate Docker tag to v37.272.0 2024-03-27 07:32:23 +00:00
testing.yml go: upgrade to go v1.22 2024-03-25 06:52:23 +01:00