orchestra-merge

Included with Lifetime

$97 forever

Merge a reviewed implementation branch into main — resolve conflicts, close the work item, and clean up the branch.

General

What this skill does


# Merge

Merge a reviewed implementation branch into main. Resolve any conflicts, close the work item, and clean up.

## Prerequisites

- Spec `status` must be `reviewed`
- `impl/{ticket-id}` branch must exist
- Review must have produced a PASS verdict

## Steps

### 1. Load the Spec

- Locate the spec from $ARGUMENTS (path or work item name)
- Confirm `status: reviewed` in the frontmatter — stop if not reviewed
- Note the branch name: `impl/{ticket-id}`

### 2. Sync with Main

Ensure main is up to date before merging:

```bash
git checkout main
git pull
```

### 3. Merge the Branch

```bash
git merge impl/{ticket-id} --no-ff -m "feat({ticket-id}): {spec title}"
```

Use `--no-ff` to preserve the branch history as a distinct unit of work.

### 4. Resolve Conflicts If Any

If conflicts arise:

- Read each conflicting file fully before resolving
- Prefer the implementation branch's intent — it was reviewed
- If a conflict involves logic that is genuinely ambiguous, stop and surface it to the user rather than guessing
- After resolving all conflicts, stage and complete the merge:
  ```bash
  git add .
  git commit -m "feat({ticket-id}): merge impl branch, resolve conflicts"
  ```

### 5. Mark Closed

Update the spec frontmatter:

```yaml
status: closed
```

Commit:

```bash
git add .orchestra/work/{id}-{name}/spec.md
git commit -m "chore({ticket-id}): close work item"
```

### 6. Delete the Branch

```bash
git branch -d impl/{ticket-id}
```

Only delete after a successful merge — confirm `git branch -d` (safe delete) not `-D` (force).

### 7. Update the Roadmap

Find the row for this milestone in `.orchestra/roadmap.md` and update its status to `Done`:

```markdown
| {Milestone Name} | .orchestra/work/{slug}/prd.md | Done |
```

Commit alongside any other cleanup:

```bash
git add .orchestra/roadmap.md
git commit -m "chore({ticket-id}): update roadmap status to Done"
```

### 8. Push to Origin

```bash
git push
```

### 9. Report

Output a concise summary:

- Merged branch and commit range
- Conflicts resolved (if any) and how
- Work item closed
- Roadmap updated
- Pushed to origin
- Final status: `closed`

## Quality Checks

- [ ] Spec status was `reviewed` before proceeding — not `complete` or `draft`
- [ ] `--no-ff` used to preserve branch history
- [ ] No conflicts left unresolved
- [ ] Branch deleted cleanly with `-d` (not `-D`)
- [ ] Spec status updated to `closed`
- [ ] Roadmap row updated to `Done`
- [ ] Pushed to origin

## Boundaries

- Do not close the branch if the merge failed — leave it for inspection
- Do not skip the status check — merging an unreviewed branch defeats the pipeline

Files: 2

Size: 4.3 KB

Complexity: 13/100

Category: General

Source: https://github.com/mpazaryna/agentic-factory/tree/main/skills/orchestra-merge

Related in General

modeling-omnistudio-epc-catalog

Included

Salesforce Industries CME EPC product-modeling skill for Product2-based catalog creation. Use when creating EPC products, configuring product attributes, building offer bundles with Product Child Items, or reviewing EPC DataPack JSON metadata for product catalog changes. TRIGGER when: user creates or updates Product2 EPC records, AttributeAssignment payloads, AttributeMetadata/AttributeDefaultValues, Offer bundles, or ProductChildItem relationships. DO NOT TRIGGER when: designing OmniScripts/FlexCards/Integration Procedures (use building-omnistudio-omniscript, building-omnistudio-flexcard, or building-omnistudio-integration-procedure), implementing Apex business logic (use generating-apex), or troubleshooting deployment pipelines (use deploying-metadata).

Generalscripts

relationship-science-coach

Included

Use this skill for direct, practical adult relationship coaching: couples conflict, repair, trust, marriage, dating, flirting, attachment patterns, emotional connection, sex, desire differences, eroticism, kink negotiation, affection, love languages, breakups, and long-term passion. Draw on Gottman, EFT and Hold Me Tight, attachment science, modern sex research, Perel, Nagoski, Kerner, Schnarch, Love and Stosny, and flexible love-language tools. Be concrete and low-hedge. Redirect only for imminent danger, abuse, coercive control, minors, non-consent, self-harm, stalking, or medical/legal/psychiatric decisions.

Generalscripts

building-sf-integrations

Included

Salesforce integration architecture and runtime plumbing with 120-point scoring. Use this skill to set up Named Credentials, External Credentials, External Services, REST/SOAP callout patterns, Platform Events, and Change Data Capture. TRIGGER when: user sets up Named Credentials, External Services, REST/SOAP callouts, Platform Events, CDC, or touches .namedCredential-meta.xml files. DO NOT TRIGGER when: Connected App/OAuth config (use configuring-connected-apps), Apex-only logic (use generating-apex), or data import/export (use handling-sf-data).

Generalscripts

venue-templates

Included

Access comprehensive LaTeX templates, formatting requirements, and submission guidelines for major scientific publication venues (Nature, Science, PLOS, IEEE, ACM), academic conferences (NeurIPS, ICML, CVPR, CHI), research posters, and grant proposals (NSF, NIH, DOE, DARPA). This skill should be used when preparing manuscripts for journal submission, conference papers, research posters, or grant proposals and need venue-specific formatting requirements and templates.

Generalscripts

let-fate-decide

Included

Draws the 12 Houses of the Zodiac Tarot spread to inject entropy into planning when prompts are vague, ambiguous, or casually delegated. Interprets the spread to guide next steps. Use when the user says 'let fate decide', 'YOLO', 'whatever', 'idk', or other nonchalant phrases, makes Yu-Gi-Oh references, or when you are about to arbitrarily pick between multiple reasonable approaches. Prefer over ask-questions-if-underspecified when the user's tone is casual or playful rather than precision-seeking.

Generalscripts

net-ops

Included

Cross-platform network troubleshooting (Windows, macOS, Linux) via local or remote shell. Use for: DNS broken, can't resolve hostnames, nslookup/dig works but apps fail, NRPT, WFP, scutil, /etc/resolver, systemd-resolved, /etc/resolv.conf, NetworkManager, VPN DNS leak residue (ProtonVPN/Mullvad/WireGuard/AnyConnect), AV/firewall blocking DNS or DoH, Tailscale DNS interaction, intermittent connectivity, remote diagnostics over SSH.

Generalscripts