fix-merge-conflicts

Name: fix-merge-conflicts
Author: outraday-org

Fix merge conflicts thoroughly by merging both sides, push, then return the local checkout to an up-to-date origin/main. Never loses work from either branch.

by outraday-org(0) 0 installs

Free

Free account. Installing gives you the manifest plus copy-paste snippets.

See reviews

About

Imported from outraday-org/invinite-data-api-dashboard (.codex/skills/fix-merge-conflicts/SKILL.md). Install upstream with npx skills add outraday-org/invinite-data-api-dashboard --skill fix-merge-conflicts. Copyright stays with the author.

Read references/command.md and follow that workflow in Codex.

Adapt the referenced Claude command for Codex:

Treat the command file as workflow guidance, not as skill metadata.
Ignore Claude-only frontmatter such as model or tools.
Replace Claude-specific slash-command or subagent steps with the closest direct Codex workflow.

Use it

Copy one of these into your project. Installing also returns the manifest and these snippets.

# after Install: the listing is in your workspace's routing pool - a plan picks it for its slot
curl -s -X POST https://api.opensmartroute.ai/api/v1/route -H 'Authorization: Bearer $OSR_API_KEY' -H 'Content-Type: application/json' -d '{"text": "...", "plan": true}'

Manifest

An Open Capability Manifest: the router reads it to know what this does, what it costs and when to pick it.

outraday-org-invinite-data-api-dashboard-fix-merge-conflicts.ocm.jsonjson

{
  "ocm": "1",
  "id": "outraday-org-invinite-data-api-dashboard-fix-merge-conflicts",
  "kind": "skill",
  "name": "fix-merge-conflicts",
  "description": "Fix merge conflicts thoroughly by merging both sides, push, then return the local checkout to an up-to-date origin/main. Never loses work from either branch.",
  "publisher": "outraday-org",
  "version": "1.0.0",
  "capabilities": {
    "domains": [
      "general"
    ],
    "tags": [
      "skill-md",
      "github"
    ],
    "languages": [
      "en"
    ]
  },
  "quality_prior": 0.6,
  "examples": [
    "Fix merge conflicts thoroughly by merging both sides, push, then return the local checkout to an up-to-date origin/main. Never loses work from either branch."
  ],
  "primary": false,
  "metadata": {
    "source": {
      "provider": "github",
      "repository": "https://github.com/outraday-org/invinite-data-api-dashboard",
      "path": ".codex/skills/fix-merge-conflicts/SKILL.md",
      "ref": "d1052a92e84e3100f271e9f76597bc32b2e4d33e",
      "url": "https://github.com/outraday-org/invinite-data-api-dashboard/blob/d1052a92e84e3100f271e9f76597bc32b2e4d33e/.codex/skills/fix-merge-conflicts/SKILL.md",
      "key": "outraday-org/invinite-data-api-dashboard/.codex/skills/fix-merge-conflicts/SKILL.md"
    }
  },
  "instructions": "Read `references/command.md` and follow that workflow in Codex.\n\nAdapt the referenced Claude command for Codex:\n\n- Treat the command file as workflow guidance, not as skill metadata.\n- Ignore Claude-only frontmatter such as `model` or `tools`.\n- Replace Claude-specific slash-command or subagent steps with the closest direct Codex workflow.",
  "cost": {
    "context_tokens": 85
  }
}

Fetch it by URL: GET /api/v1/registry/outraday-org-invinite-data-api-dashboard-fix-merge-conflicts/manifest?version=1.0.0

About

Use it

Manifest

Reviews