chore: back-merge main into develop - #342
Merged
Merged
Conversation
Journal des vingt-six changements accumulés depuis la 0.6.1, plus le réglage de voix par coach et le déblocage de la profondeur. Badges des huit README, exemple de version du gabarit de remontée, liens de comparaison du journal. 1015 tests verts, flutter analyze propre, format inchangé. Claude-Session: https://claude.ai/code/session_01L4UqzJYEndHBCS3WBayUt6
Release/0.6.2
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.
Back-merge automatique après merge sur `main` (release ou hotfix).
Cette PR récupère les commits de `main` (typiquement : bump de version, tag de release, hotfixes) dans `develop` pour aligner les deux branches et éviter la divergence à la prochaine release.
Résolution des conflits
Conflit attendu sur `rhythm_coach/pubspec.yaml` quand develop a déjà bumpé pour la prochaine itération. Garder la version la plus haute (celle de develop si > main, sinon celle de main).
Stratégie de merge
Merge commit (pas squash, pas rebase) — on veut préserver l'historique des releases dans develop.
PR ouverte automatiquement par `.github/workflows/back-merge.yml`.