Repository navigation
chore: réaligne dev sur main (release #113 mergée en rebase) - #116
Merged
Merged
Conversation
…time definitions (#72)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…i sur 8 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
… patch Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…ne version sans pages Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
… à jour Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
La release #113 a été mergée en rebase : main porte les mêmes changements que dev sous d'autres SHA, et la release suivante (#115) était en conflit. Merge -s ours : aucun fichier ne change (l'arbre de main est celui de dev avant #114), seul l'historique de main est enregistré dans dev. Co-Authored-By: Claude Opus 5.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.
Pourquoi
La release #113 (
dev→main) a été mergée en rebase au lieu d'un commit de merge, contrairement aux releases #109 et #111. GitHub a donc réécrit surmainles commits de la #112 avec de nouveaux SHA :mainetdevportent les mêmes changements sous des identifiants différents. Résultat : la release suivante, #115, est en conflit.Ce que fait cette PR
Un merge
-s oursdeorigin/maindansdev:dev, ce que j'ai vérifié. L'arbre demain(c5dbfb0) est d'ailleurs exactement celui dedevavant la refactor(version): namespaceFromMajor, restes de la relecture de #112 #114 (fc89f7f) ;mainest enregistré dansdev. Une fois cette PR mergée, la release Release: namespaceFromMajor, restes de la relecture (#114) #115 se fusionne proprement (git merge-tree: pas de conflit).À merger
En commit de merge, pas en rebase ni en squash, sinon le merge
-s oursest perdu. Ensuite, la #115 se merge elle aussi en commit de merge, comme #109 et #111.🤖 Generated with Claude Code