The data race and test timeout fix reached main as its own commit (#110) while the same change was already on next (#105, commit 915f56e). The two commits have identical trees, but next changed Makefile, internal/ircserver/relay.go and internal/server/server.go again afterwards, so the three files conflict and Gitea reports #111 as not mergeable.
main's tree is the tree of 915f56e on next, so main holds nothing next lacks: resolving every conflict to next's side is the whole fix.
Definition of done
One PR against next whose one new commit merges main into next, every conflict resolved to next's version, so the merge changes no file (git diff origin/next HEAD is empty).
script/cibuild green on the PR head.
Landed on next with the merge commit kept, not squashed; Gitea then reports #111 mergeable.
Model: opus-5-5
The data race and test timeout fix reached `main` as its own commit (https://git.eeqj.de/sneak/neoirc/pulls/110) while the same change was already on `next` (https://git.eeqj.de/sneak/neoirc/pulls/105, commit `915f56e`). The two commits have identical trees, but `next` changed `Makefile`, `internal/ircserver/relay.go` and `internal/server/server.go` again afterwards, so the three files conflict and Gitea reports https://git.eeqj.de/sneak/neoirc/pulls/111 as not mergeable.
`main`'s tree is the tree of `915f56e` on `next`, so `main` holds nothing `next` lacks: resolving every conflict to `next`'s side is the whole fix.
## Definition of done
1. One PR against `next` whose one new commit merges `main` into `next`, every conflict resolved to `next`'s version, so the merge changes no file (`git diff origin/next HEAD` is empty).
2. `script/cibuild` green on the PR head.
3. Landed on `next` with the merge commit kept, not squashed; Gitea then reports https://git.eeqj.de/sneak/neoirc/pulls/111 mergeable.
Model: opus-5-5
clawbot
self-assigned this 2026-10-20 10:40:58 +02:00
Opened #133: one commit that merges main into next, with every conflict resolved to next's version, so it changes no file. It has to land as a merge commit for #111 to become mergeable.
Model: opus-5-5
Opened https://git.eeqj.de/sneak/neoirc/pulls/133: one commit that merges `main` into `next`, with every conflict resolved to `next`'s version, so it changes no file. It has to land as a merge commit for https://git.eeqj.de/sneak/neoirc/pulls/111 to become mergeable.
Model: opus-5-5
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.
The data race and test timeout fix reached
mainas its own commit (#110) while the same change was already onnext(#105, commit915f56e). The two commits have identical trees, butnextchangedMakefile,internal/ircserver/relay.goandinternal/server/server.goagain afterwards, so the three files conflict and Gitea reports #111 as not mergeable.main's tree is the tree of915f56eonnext, somainholds nothingnextlacks: resolving every conflict tonext's side is the whole fix.Definition of done
nextwhose one new commit mergesmainintonext, every conflict resolved tonext's version, so the merge changes no file (git diff origin/next HEADis empty).script/cibuildgreen on the PR head.nextwith the merge commit kept, not squashed; Gitea then reports #111 mergeable.Model: opus-5-5
Opened #133: one commit that merges
mainintonext, with every conflict resolved tonext's version, so it changes no file. It has to land as a merge commit for #111 to become mergeable.Model: opus-5-5