Resolve PR #242 merge blocker by reconciling music-social workflow conflict#250
Merged
DavidKRK merged 1 commit intoMay 29, 2026
Conversation
|
|
Copilot created this pull request from a session on behalf of
DavidKRK
May 29, 2026 04:57
View session
Contributor
There was a problem hiding this comment.
Pull request overview
Resolves a merge conflict in the music-social GitHub Actions workflow while preserving the workflow’s behavior: generating a safe, normalized commit message for the created issue and keeping canonical (non-www) site URLs.
Changes:
- Normalize
COMMIT_MSGhandling by extracting the first non-empty line and supporting both\nand\r\n, then trimming the result. - Update social template text to reference
https://davidkrk.com(nowww). - Update
music.htmllinks in the created issue body/checklist to the non-wwwcanonical URL.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
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
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.
Cette PR ne pouvait pas être mergée à cause d’un conflit avec
gh-pagesdans le workflowmusic-social.La résolution conserve l’intention fonctionnelle de la PR (message de commit sûr + URLs canoniques) tout en alignant la branche sur la base actuelle.
Conflit de merge résolu dans
.github/workflows/music-social.ymlcommitMsg.Sanitization du message de commit préservée
COMMIT_MSG.\net\r\npour éviter les régressions de formatage dans le body d’issue.Cohérence URL maintenue
music.htmlet templates sociaux conservées surhttps://davidkrk.com(sanswww).