Michael added a comment.
This broke again two months ago (failing action <https://github.com/wikimedia/mediawiki-extensions-Wikibase/actions/runs/6409083044>, gerrit commit <https://gerrit.wikimedia.org/r/c/mediawiki/extensions/Wikibase/+/955765>). Now the error is different - merge conflicts: counterexample Auto-merging RELEASE-NOTES.md CONFLICT (content): Merge conflict in RELEASE-NOTES.md Auto-merging src/Entity/ItemId.php CONFLICT (content): Merge conflict in src/Entity/ItemId.php Auto-merging src/Entity/NumericPropertyId.php CONFLICT (content): Merge conflict in src/Entity/NumericPropertyId.php Auto-merging tests/unit/Entity/EntityIdTest.php Auto-merging tests/unit/Entity/EntityIdValueTest.php Auto-merging tests/unit/Entity/ItemIdTest.php CONFLICT (content): Merge conflict in tests/unit/Entity/ItemIdTest.php Auto-merging tests/unit/Entity/NumericPropertyIdTest.php CONFLICT (content): Merge conflict in tests/unit/Entity/NumericPropertyIdTest.php Rebasing (1/1) error: could not apply 293be2693e... EntityId: Remove Serializable interface and methods hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply 293be2693e... EntityId: Remove Serializable interface and methods Not sure if we should open a new task for this or uncheck the ACs here. But I am noting that this task's AC for the email notification is still unfulfilled, which is why we did not notice this for two months. 🫤 TASK DETAIL https://phabricator.wikimedia.org/T314987 EMAIL PREFERENCES https://phabricator.wikimedia.org/settings/panel/emailpreferences/ To: Michael Cc: Winston_Sung, hoo, Lucas_Werkmeister_WMDE, WMDE-leszek, Aklapper, Michael, Tarrow, Danny_Benjafield_WMDE, Isabelladantes1983, Themindcoder, Adamm71, Jersione, Hellket777, LisafBia6531, Astuthiodit_1, 786, Biggs657, karapayneWMDE, Invadibot, maantietaja, Juan90264, Alter-paule, Beast1978, ItamarWMDE, Un1tY, Akuckartz, Hook696, Kent7301, joker88john, CucyNoiD, Nandana, Gaboe420, Giuliamocci, Cpaulf30, Lahi, Gq86, Af420, Bsandipan, GoranSMilovanovic, QZanden, LawExplorer, Lewizho99, Maathavan, _jensen, rosalieper, Neuronton, Scott_WUaS, Wikidata-bugs, aude, Mbch331
_______________________________________________ Wikidata-bugs mailing list -- wikidata-bugs@lists.wikimedia.org To unsubscribe send an email to wikidata-bugs-le...@lists.wikimedia.org
