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

Open
opened 1 year ago by dnkl · 11 comments
dnkl commented 1 year 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" ...
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 year ago
Poster

Works like a charm now!

Works like a charm now!
dnkl closed this issue 1 year 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 year ago
fnetX added
docs
and removed
question
labels 1 year 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).
Collaborator

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?

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

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?

Hey, [here](https://codeberg.org/Codeberg/Documentation/issues/127#issuecomment-208004) 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?
Owner

@fnetX

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

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

I have forwarded this issue to upstream.

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

I have forwarded this issue to upstream. See: https://github.com/go-gitea/gitea/issues/18520
schorsch added the
upstream
label 8 months ago
Sign in to join this conversation.
No Milestone
No Assignees
4 Participants
Notifications
Due Date

No due date set.

Dependencies

No dependencies set.

Reference: Codeberg/Community#438
Loading…
There is no content yet.