Manual merges does not work reliable #2600

BaumiCoder commented 2026年05月07日 14:58:16 +02:00

Comment

I am merging Pull Request (PR) always manually in my project by merging them locally. Today, I merged two PRs in my project, but the second one got marked as closed and not as merge.

1. PR BaumiCoder/ecformat#40 merged with BaumiCoder/ecformat@c46ba8b80b is marked correctly as merged.
2. PR BaumiCoder/ecformat#41 merged with BaumiCoder/ecformat@f0d59bc39d is marked incorrectly as closed.

I did not change anything in the settings of the project in between and both situations looks very similar to me. Therefore, I have no idea why the merge of the second PR was not detected properly. Maybe it is some bug in Forgejo, but without insides about why it appears and a way of reproduction a bug report there seems to be not helpful. Maybe some details in the logs of Codeberg.org or similar can help here. Did I something wrong when merging the second PR or what difference triggered the problem in detection the manual merge?

### Comment I am merging Pull Request (PR) always manually in my project by merging them locally. Today, I merged two PRs in my project, but the second one got marked as closed and not as merge. 1. PR https://codeberg.org/BaumiCoder/ecformat/pulls/40 merged with https://codeberg.org/BaumiCoder/ecformat/commit/c46ba8b80bad4bc8cbffe17a0ec8a8af05828a1b is marked correctly as merged. 2. PR https://codeberg.org/BaumiCoder/ecformat/pulls/41 merged with https://codeberg.org/BaumiCoder/ecformat/commit/f0d59bc39d2e83af20a21f175180a85bb8421f1e is marked incorrectly as closed. I did not change anything in the settings of the project in between and both situations looks very similar to me. Therefore, I have no idea why the merge of the second PR was not detected properly. Maybe it is some bug in Forgejo, but without insides about why it appears and a way of reproduction a bug report there seems to be not helpful. Maybe some details in the logs of Codeberg.org or similar can help here. Did I something wrong when merging the second PR or what difference triggered the problem in detection the manual merge?

Gusted commented 2026年05月07日 23:28:04 +02:00

That's indeed strange, the logs don't show much info. It was around the time where a lot of deadlocks were being observed (#2596). So I'm assuming the detection was right but was unable to mark it as merged.

That's indeed strange, the logs don't show much info. It was around the time where a lot of deadlocks were being observed (#2596). So I'm assuming the detection was right but was unable to mark it as merged.

mahlzahn commented 2026年05月08日 00:00:43 +02:00

I think you might be able to mark the PR manually as manually merged after re-opening and giving the merge commit?

(@Gusted, if you want tp have a look: I experienced recently a squash merge which left the PR open, forgejo/docs#1929 (comment), and marked it as manually merged afterwards.)

I think you might be able to mark the PR manually as manually merged after re-opening and giving the merge commit? (@Gusted, if you want tp have a look: I experienced recently a squash merge which left the PR open, https://codeberg.org/forgejo/docs/pulls/1929#issuecomment-14348657, and marked it as manually merged afterwards.)

BaumiCoder commented 2026年05月08日 08:08:37 +02:00

@mahlzahn wrote in #2600 (comment):

I think you might be able to mark the PR manually as manually merged after re-opening and giving the merge commit?

Thanks, that worked even faster than expected. I re-opened the second PR. First, it said the check for automatic merge is still running. After a few minutes, the PR switched automatically to the Status merged. It almost looks like there were never any problem 👍. Only the timestamp of the PR merge is the point in time of the PR re-opening and not the timestamp of the commit.

@mahlzahn wrote in https://codeberg.org/Codeberg/Community/issues/2600#issuecomment-14470358: > I think you might be able to mark the PR manually as manually merged after re-opening and giving the merge commit? Thanks, that worked even faster than expected. I re-opened the second PR. First, it said the check for automatic merge is still running. After a few minutes, the PR switched automatically to the Status merged. It almost looks like there were never any problem 👍. Only the timestamp of the PR merge is the point in time of the PR re-opening and not the timestamp of the commit.