Manual, no-ff merges no longer recognized in PRs #438

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 

Examples:

• dnkl/fcft#21 (merged in dnkl/fcft@12652429ff)
• dnkl/foot#472 (merged in dnkl/foot@ca685c4c76)

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!

Yeah, please hit us up and give feedback on the changes ...

Works like a charm now!

Btw, thanks for the super quick answers!

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).

This question was still in the room, just writing it out once more:

Why is autodetection disabled for all repos with enabled PRs as of Gitea 1.14, but enabled for new repos and enabled for repos after disabling & enabling PRs again?

Hey, here is a rant of mine about the current behaviour.

I'm not sure if this is just something for the docs or still a little broken, also with the default settings that is apparently "disabled" for old + new repos, but "enabled" after you toggle pull requests twice?

@fnetX

Good question, for me git got disabled and I reenabled it now, hope it works

I have forwarded this issue to upstream.

See: https://github.com/go-gitea/gitea/issues/18520

Hi there, I think I just encountered this bug and it’s very confusing.

I followed the instructions to do a manual merge and the manual merge is not being picked up by Codeberg/Gitea.

If I close the pull request, it appears as closed not merged.

Any ideas? (It looks like this issue has been open for two years so I’m assuming others are encountering it also.)

image

Did you adjust the repo settings as described in the very first posts here?

@fnetX Ah, no... is there a reason why that isn't the default?

I think it's the default for new repos, but not enabled for all old. If people generally agree, we could adjust the settings for all projects once I think ... not sure if there are caveats.

The option was added here: https://github.com/go-gitea/gitea/pull/12543

I only scanned the PR, but seems like "undefined" edge-cases doesn't make the auto detector happy. I'm not familair with this feature, I'm not able to make a suggestion here.

I just ran into this issue. If manual merges are enabled by default now it's good. Anyway it would be good to either remove the command-line instructions if manual merges are disabled or add the information that they have to be enabled.