Skip to content

Add skill for merge-up#3427

Merged
Kocal merged 1 commit intosymfony:2.xfrom
Kocal:skill-upmerge
Apr 3, 2026
Merged

Add skill for merge-up#3427
Kocal merged 1 commit intosymfony:2.xfrom
Kocal:skill-upmerge

Conversation

@Kocal
Copy link
Copy Markdown
Member

@Kocal Kocal commented Apr 3, 2026

Q A
Bug fix? no
New feature? no
Deprecations? no
Documentation? no
Issues Fix #...
License MIT

Taken and adapted from https://github.com/symfony/symfony/blob/8.1/.agents/skills/symfony-merge-up/SKILL.md (thank you @fabpot ❤️).

Next steps:

  • be able to run PHPUnit tests for all packages when running ./phpunit at the repo root (something I wanted to do months ago, hopefully it will make snapshots generation easier with Map and bridges)
  • add a composer.json with every packages's (dev)dependencies

@Kocal Kocal self-assigned this Apr 3, 2026
@carsonbot carsonbot added the Status: Needs Review Needs to be reviewed label Apr 3, 2026
@carsonbot carsonbot changed the title Add skill for merge-up Add skill for merge-up Apr 3, 2026
@Kocal
Copy link
Copy Markdown
Member Author

Kocal commented Apr 3, 2026

Results: 11d8926

@Kocal Kocal merged commit 47f9f99 into symfony:2.x Apr 3, 2026
27 of 29 checks passed
@Kocal Kocal deleted the skill-upmerge branch April 3, 2026 16:11
@Kocal Kocal mentioned this pull request Apr 3, 2026
Kocal added a commit that referenced this pull request Apr 3, 2026
This PR was merged into the 3.x branch.

Discussion
----------

[3.x] Upmerge fixes

| Q              | A
| -------------- | ---
| Bug fix?       | no
| New feature?   | no <!-- please update src/**/CHANGELOG.md files -->
| Deprecations?  | no <!-- if yes, also update UPGRADE-*.md and src/**/CHANGELOG.md -->
| Documentation? | no <!-- required for new features, or documentation updates -->
| Issues         | Fix #... <!-- prefix each issue number with "Fix #", no need to create an issue if none exist, explain below instead -->
| License        | MIT

Maybe that was not a good idea to run Opencode/Claude with the up-merge skill when being in the train with a not-super-good connection... 😅 I had some timeout when the agents were running tests and cie, but I didn't retry them.

Related to #3427

Commits
-------

6c385fa [3.x] Upmerge fixes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Status: Needs Review Needs to be reviewed

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants