About

Imported from delulu-smash/delulu-smash (.pydantic-deep/skills/git-workflow/SKILL.md). Install upstream with npx skills add delulu-smash/delulu-smash --skill git-workflow. Copyright stays with the author.

Git Workflow

Name: git-workflow
Author: delulu-smash

Commit Messages

Format: <type>: <description>

Types: feat, fix, refactor, test, docs, style, chore

Description starts with lowercase verb
Max 72 characters for first line
Add body for complex changes

Branch Workflow

Create feature branch from main: git checkout -b feat/description
Make changes in small, focused commits
Push and create PR
After review, squash-merge to main

Conflict Resolution

git fetch origin
git rebase origin/main (or merge if team prefers)
For each conflict:
- Read both versions carefully
- Understand the intent of each change
- Resolve preserving both intents
- Test after resolving
git rebase --continue

Safety Rules

Never force-push to main/master
Never commit secrets, credentials, or .env files
Always check git diff before committing
Use git stash before switching branches with uncommitted changes

Use it

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

yaml

targets:
  - https://api.opensmartroute.ai/api/v1/registry/delulu-smash-delulu-smash-git-workflow/manifest   # or paste the manifest below

Manifest

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

delulu-smash-delulu-smash-git-workflow.ocm.jsonjson

{
  "ocm": "1",
  "id": "delulu-smash-delulu-smash-git-workflow",
  "kind": "skill",
  "name": "git-workflow",
  "description": "Git operations: commits, branches, PRs, and conflict resolution",
  "publisher": "delulu-smash",
  "version": "1.0.0",
  "capabilities": {
    "domains": [
      "coding"
    ],
    "tags": [
      "skill-md",
      "git",
      "workflow",
      "github"
    ],
    "languages": [
      "en"
    ]
  },
  "quality_prior": 0.6,
  "examples": [
    "Git operations: commits, branches, PRs, and conflict resolution"
  ],
  "primary": false,
  "metadata": {
    "source": {
      "provider": "github",
      "repository": "https://github.com/delulu-smash/delulu-smash",
      "path": ".pydantic-deep/skills/git-workflow/SKILL.md",
      "ref": "8d27cb1129c57aea3de0748f76cf83dfd565170e",
      "url": "https://github.com/delulu-smash/delulu-smash/blob/8d27cb1129c57aea3de0748f76cf83dfd565170e/.pydantic-deep/skills/git-workflow/SKILL.md",
      "key": "delulu-smash/delulu-smash/.pydantic-deep/skills/git-workflow/SKILL.md"
    }
  },
  "instructions": "# Git Workflow\n\n## Commit Messages\n\nFormat: `<type>: <description>`\n\nTypes: feat, fix, refactor, test, docs, style, chore\n\n- Description starts with lowercase verb\n- Max 72 characters for first line\n- Add body for complex changes\n\n## Branch Workflow\n\n1. Create feature branch from main: `git checkout -b feat/description`\n2. Make changes in small, focused commits\n3. Push and create PR\n4. After review, squash-merge to main\n\n## Conflict Resolution\n\n1. `git fetch origin`\n2. `git rebase origin/main` (or merge if team prefers)\n3. For each conflict:\n   - Read both versions carefully\n   - Understand th",
  "cost": {
    "context_tokens": 232
  }
}

Fetch it by URL: GET /api/v1/registry/delulu-smash-delulu-smash-git-workflow/manifest?version=1.0.0

Reviews

Star ratings from people who tried it. One review per account; edit yours any time.

No reviews yet. Install it, try it, and be the first to rate it.