chore(sync): merge main into dev — réconcilier l'historique 0.9.0#454
Merged
Conversation
Promotion dev→main du batch 0.7.0. Gates : 4-flavor review (faux positifs), Codex GO (IMPORTANT corrigé #358), release dev v100 verte. Merge --admin : exception mono-maintainer (CLAUDE.md) — pas de reviewer « sûr » (compte alterne non liable au repo sous pseudonyme). CI verte.
Promotion dev → main du batch 2026-06-10 (night-run 8 items + dogfooding v102/v103 + fix review Codex + bump 0.8.0). Closes #362 Closes #277 Closes #314 Closes #325 Closes #324 Closes #312 Closes #307 Merge commit no-ff (modèle promote-only), dev conservée. --admin : mono-maintainer, go explicite du mainteneur en chat (cf. AGENTS.md § Review en mono-maintainer).
Frozen promotion candidate from dev bb3ee57 (dev build 112) : the night run keeps merging on dev, this branch is what Codex reviews and what ships to beta if the review is clean. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Promotion dev → main pour la bêta 0.9.0 (versionCode via registre tags). Merge no-ff pour préserver l'historique des 7 PR de la soirée (#388–#392, #397, #399). Review Codex du candidat : SHIP (1 mineur corrigé e8cc413). Merge --admin : mono-maintainer, pas de reviewer sûr disponible (cf. AGENTS.md). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
La promotion 0.9.0 (#400) a laissé sur main des commits de bump/changelog (11935ae, e8cc413) reportés textuellement sur dev par #401 : les deux branches divergeaient sur app/CHANGELOG.md et app/build.gradle.kts, et la promotion 0.10.0 (#451) ne pouvait pas créer son merge commit. Résolution : contenu dev conservé tel quel pour les deux fichiers — la version dev est strictement plus récente (v113 statut « open » + sha de promotion via #401, correction « 7 PR » d'e8cc413e incluse, entrée v126, versionName 0.10.0 + stamp -dev). L'arbre résultant est identique à dev. Avec main contenu dans dev, #451 et les promotions futures mergent proprement. Demandé par @xatrix Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Débloque la promotion #451 : la 0.9.0 (#400) a laissé sur main des commits de bump/changelog (
11935ae2,e8cc413e) reportés textuellement sur dev par #401 — les branches divergeaient surapp/CHANGELOG.mdetapp/build.gradle.kts, GitHub ne pouvait pas créer le merge commit de #451.Ce merge de synchro résout les deux conflits en conservant le contenu dev tel quel (strictement plus récent : v113 statut « open » + sha de promotion via #401, correction « 7 PR » d'
e8cc413eincluse, v126, versionName 0.10.0 + stamp). L'arbre résultant est identique à dev (git diff HEAD origin/devvide) — seule l'histoire change, main devient contenu dans dev.🤖 Generated with Claude Code