Manual, no-ff merges no longer recognized in PRs
After the update to Gitea 1.14, manually merging a PR by doing a non FF merge is no longer recognized as a "merge" in the PR. Instead, the PR says:
⚠ This branch is equal with the target branch. ⚠ This branch is out-of-date with the base branch
have a look at the settings, there are some changed options including manually specifiying a commit if autodetection fails. I don't know why the default behaviour apparently changed?
I tested this here ... Codeberg/blog#8
The settings are somewhere alike "Allow manual merges" and "Enable autodetection" ...
Thanks, clicked the check-boxes and will see how it goes next time.
I enabled both "allow manual merges" and "enable autodetection of manual merges". I't doesn't appear to do the auto-detection of already merged PRs, but I am seeing the "manual merge" button in them. So hopefully all is good now, thanks again!
We might consider whether enabling this as default makes sense or if we should explain this in the docs ...
FWIW: I had one repo where PRs were disabled altogether. There, autodetection was enabled by default when I enabled PRs (both mentioned check-boxes were ticked).
Deleting a branch is permanent. It CANNOT be undone. Continue?