git-pre-release-conflict

Git Pre Release + Conflict Resolution

Safety Notice

This listing is imported from skills.sh public index metadata. Review upstream SKILL.md and repository scripts before running.

Copy this and send it to your AI assistant to learn

Install skill "git-pre-release-conflict" with this command: npx skills add theonelee/theone_claude_skill/theonelee-theone-claude-skill-git-pre-release-conflict

Git Pre Release + Conflict Resolution

When to use

  • Requests like "publish to pre", "sync branch to pre", or "rebuild pre".

  • Any complex Git conflict resolution in this repo, especially during release merges.

Quick start

  • Confirm <main_branch> and <feature_branch> with the user.

  • For the release/sync workflow, follow references/flow.md .

  • If conflicts occur, follow references/conflict_playbook.md .

Safety gates

  • Do not delete or force-push branches without explicit user confirmation.

  • If network access is blocked, request approval before any git fetch /git push .

  • Preserve unrelated changes; avoid git add . unless explicitly told.

Output expectations

  • Report branch names, stash actions, and conflict file list.

  • Summarize conflict decisions (ours/theirs/manual merge).

  • Provide final git status summary and next steps.

Source Transparency

This detail page is rendered from real SKILL.md content. Trust labels are metadata-based hints, not a safety guarantee.

Open in GitHubOpen in ClawHub

Related Skills

Related by shared tags or category signals.

General

git_refactor_skill

No summary provided by upstream source.

Repository SourceNeeds Review
5-theonelee
Coding

code_review

No summary provided by upstream source.

Repository SourceNeeds Review
9-theonelee
General

neo

Browse websites, read web pages, interact with web apps, call website APIs, and automate web tasks. Use Neo when: user asks to check a website, read a web page, post on social media (Twitter/X), interact with any web app, look up information on a specific site, scrape data from websites, automate browser tasks, or when you need to call any website's API. Keywords: website, web page, browse, URL, http, API, twitter, tweet, post, scrape, web app, open site, check site, read page, social media, online service.

Archived SourceRecently Updated
--4ier
General

image-gen

Generate AI images from text prompts. Triggers on: "生成图片", "画一张", "AI图", "generate image", "配图", "create picture", "draw", "visualize", "generate an image".

Archived SourceRecently Updated
--0xfango