Skip to content

Resolve PR #242 merge blocker by reconciling music-social workflow conflict#250

Merged
DavidKRK merged 1 commit into
copilot/fix-dead-links-in-docsfrom
copilot/arranger-probleme-emergence
May 29, 2026
Merged

Resolve PR #242 merge blocker by reconciling music-social workflow conflict#250
DavidKRK merged 1 commit into
copilot/fix-dead-links-in-docsfrom
copilot/arranger-probleme-emergence

Conversation

Copilot AI commented May 29, 2026

Copy link
Copy Markdown
Contributor

Cette PR ne pouvait pas être mergée à cause d’un conflit avec gh-pages dans le workflow music-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.yml

    • Harmonisation de la logique concurrente dans le bloc commitMsg.
    • Conservation d’un fallback explicite et d’un message final normalisé.
  • Sanitization du message de commit préservée

    • Extraction de la première ligne non vide de COMMIT_MSG.
    • Support des fins de ligne \n et \r\n pour éviter les régressions de formatage dans le body d’issue.
  • Cohérence URL maintenue

    • Références music.html et templates sociaux conservées sur https://davidkrk.com (sans www).
const defaultCommitMsg = 'Mise à jour manuelle';
const commitMsg = ((process.env.COMMIT_MSG || defaultCommitMsg)
  .split(/\r?\n/)
  .find(line => line.trim().length > 0) || defaultCommitMsg).trim();

@bolt-new-by-stackblitz

Copy link
Copy Markdown

Review PR in StackBlitz Codeflow Run & review this pull request in StackBlitz Codeflow.

@DavidKRK DavidKRK marked this pull request as ready for review May 29, 2026 04:57
Copilot AI review requested due to automatic review settings May 29, 2026 04:57

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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_MSG handling by extracting the first non-empty line and supporting both \n and \r\n, then trimming the result.
  • Update social template text to reference https://davidkrk.com (no www).
  • Update music.html links in the created issue body/checklist to the non-www canonical URL.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated no new comments.

@DavidKRK DavidKRK merged commit ea2f838 into copilot/fix-dead-links-in-docs May 29, 2026
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants