mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-22 12:54:53 -05:00
ffdba30a62
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 |
||
|---|---|---|
| .. | ||
| backport.yml | ||
| build-release-integration.yml | ||
| build-release.yml | ||
| cascade-setup-end-to-end.yml | ||
| e2e.yml | ||
| mirror.yml | ||
| publish-release.yml | ||
| renovate.yml | ||
| testing.yml | ||