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

Open
opened 1 week ago by dnkl · 7 comments
dnkl commented 1 week ago

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:

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: * https://codeberg.org/dnkl/fcft/pulls/21 (merged in https://codeberg.org/dnkl/fcft/commit/12652429fffdd9d1afedbe69dedb220cf49ea774) * https://codeberg.org/dnkl/foot/pulls/472 (merged in https://codeberg.org/dnkl/foot/commit/ca685c4c764ce45e10215c7e4e6d3f60f3bcc32a)
Collaborator

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

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 ... https://codeberg.org/Codeberg/blog/pulls/8 The settings are somewhere alike "Allow manual merges" and "Enable autodetection" ...
dnkl commented 1 week ago
Poster

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!

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!
Collaborator

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

Yeah, please hit us up and give feedback on the changes ...
fnetX added the
gitea-related
question
labels 1 week ago
dnkl commented 1 week ago
Poster

Works like a charm now!

Works like a charm now!
dnkl closed this issue 1 week ago
dnkl commented 1 week ago
Poster

Btw, thanks for the super quick answers!

Btw, thanks for the super quick answers!
Collaborator

We might consider whether enabling this as default makes sense or if we should explain this in the docs ...

We might consider whether enabling this as default makes sense or if we should explain this in the docs ...
fnetX reopened this issue 1 week ago
fnetX added
docs
gitea-related
and removed
gitea-related
question
labels 1 week ago
dnkl commented 1 week ago
Poster

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

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).
Sign in to join this conversation.
Loading…
There is no content yet.