Loading...
Loading...
Found 22 Skills
Keep AI tooling files (.claude, .codex, .cursor, .windsurf, .augment, .kiro, .cline, .roo, .gemini, etc.) on dev branch but exclude them from main/master. Use when managing branches, creating PRs to main, merging to main, or setting up a repo's branch strategy for AI-assisted development. Triggers on git merge/PR operations targeting main or master.
Use when implementation is complete, tests pass, and code needs to reach main — via PR with auto-merge (CI up) or local shallow-clone merge (CI down)
Domain knowledge for the nightly main-to-dev sync workflow. Covers merge strategy, CI architecture, failure investigation, and known issues.
Git branch completion workflow. Use when implementation is complete, tests pass, and a feature branch needs to be integrated via merge, pull request, or cleanup.
Check for and apply updates to installed skill branches from upstream.
Land a subagent worktree branch onto the integration branch with preflight + recorded rollback. Triggers: HSM `merge-pending` substate, `merge_orchestrate` next_action verb. Local git operation — NOT remote PR merging (that is `merge_pr` in the synthesize phase).
Use when encountering merge conflicts - handle conflicts cleanly, verify resolution, and maintain code integrity
Use this skill to diagnose and resolve what blocks a DevOps Center promotion of a work item's feature branch: Git merge conflicts and deployment failures. DevOps Center is Git-backed, so overlapping metadata changes surface as merge conflicts against the target stage branch, resolved with git (detect, resolve markers, commit, push). Deploy failures often cite a missing dependency a full promotion can fix when the component already exists on the branch. TRIGGER when the user wants to check a work item for conflicts before promoting, resolve merge conflicts or leftover conflict markers in metadata files (.xml, .object-meta.xml, .cls), reconcile a feature branch with its target stage branch, or diagnose why a DevOps Center promotion or deployment failed and whether a full promotion or a missing-dependency fix will resolve it. DO NOT TRIGGER for running the promotion itself (use dx-devops-promote), creating or updating work items (use dx-devops-work-item-manage), or deploying metadata directly to an org.
Finish a feature by merging it to the base branch and cleaning up the worktree. Use when completing a feature or story, handles merge, push, and cleanup automatically.
Use when a PR has merge conflicts with its base branch, including conflicts found during babysitting or merging.