Skip to content

docs(skills): Document squash-only merge requirement #635

@cursor

Description

@cursor

Summary

The repository only allows squash merges, but this is not documented in the skill documentation or agent instructions.

Issue Encountered

When attempting to enable auto-merge with --merge:

gh pr merge 625 --auto --merge --delete-branch
# Error: Merge method merge commits are not allowed on this repository

Had to retry with --squash:

gh pr merge 625 --auto --squash --delete-branch
# Success

Impact

  • Agents waste tokens on failed merge attempts
  • Skills like Merge-PR.ps1 default to merge strategy

Suggested Fixes

  1. Update Merge-PR.ps1 default: Change default strategy from "merge" to "squash"
  2. Add documentation: Note in AGENTS.md that squash is the only allowed merge method
  3. Add skill memory: Create Serena memory documenting this constraint

Files to Update

  • .claude/skills/github/scripts/pr/Merge-PR.ps1 - Change default
  • AGENTS.md - Add merge policy documentation
  • .serena/memories/github-merge-policy.md - Create new memory

Metadata

Metadata

Assignees

No one assigned

    Labels

    agent-memoryContext persistence agentarea-promptsAgent prompts and templatesarea-skillsSkills documentation and patternsbugSomething isn't workingdocumentationImprovements or additions to documentationenhancementNew feature or requestpriority:P2Normal: Standard enhancement or bug fix, moderate impact

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions