skills.rest
scsm-unrestrict
scsm-unrestrictCOMMUNITY
Explore all skills by this author →
GitHub

git-workflow

Guides PR preparation, branch cleanup, merge conflict resolution, and monorepo tagging workflows.

1|Updated Aug 18, 2026
Search Tags:#git#pull request#monorepo#merge conflicts#github cli#branch cleanup#release tags
One-click install
npx skills add https://github.com/scsm-unrestrict/dsh-frontend-engineer-agent --skill git-workflow-scsm-unrestrict
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: git-workflow
Source: https://github.com/scsm-unrestrict/dsh-frontend-engineer-agent/tree/main/frontend-engineer/skills/git-workflow
Command: npx skills add https://github.com/scsm-unrestrict/dsh-frontend-engineer-agent --skill git-workflow-scsm-unrestrict

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve? Common git operations like preparing pull requests, cleaning up merged branches, and resolving conflicts are error-prone when done from memory, leading to messy histories, lost work, or misconfigured releases. ## Core Features & Use Cases - PR Preparation: Gathers commit context with git log and diff, drafts structured PR titles and bodies, and creates the PR via the GitHub CLI. - Branch Cleanup: Safely deletes local branches already merged into main and prunes stale remote tracking refs. - Merge Conflict Resolution: Provides decision paths for rebase versus manual extraction when conflicts are architectural. - Monorepo Tags & Repo Hygiene: Enforces package-scoped release tags, .gitignore-first initialization, and private repo license audits. - Use Case: After finishing a feature branch, ask the agent to prepare the PR; it inspects the commits, writes a summary with a test plan, pushes the branch, and opens the PR with gh. ## Quick Start Ask the agent to prepare a pull request for the current branch and clean up any merged local branches afterward.

Frequently Asked Questions about git-workflow

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I prepare a pull request with git and GitHub CLI?▼

List commits with git log main..HEAD --oneline, review changes with git diff main...HEAD --stat, then push and run gh pr create with a title under 70 characters and a body containing a summary and test plan.

How to delete local branches already merged into main?▼

Run git branch --merged main, filter out main, master, and develop, then pipe the result to git branch -d. Follow with git fetch --prune to remove stale remote tracking references.

Should I rebase or merge when a PR has conflicts?▼

Rebase works well for few commits with no shared history. For many conflicts or architectural divergence, abort the rebase, extract useful code with git show, apply changes manually to main, and close the original PR with an explanation.

How do I tag releases in a monorepo?▼

Scope tags to the package using the pattern {package-name}-v{semver}, such as contextbricks-v2.1.0, instead of a bare version tag. Push the scoped tag with git push origin followed by the tag name.

What should a private repo check before publishing?▼

Verify visibility with gh repo view --json visibility. If private, ensure LICENSE contains a proprietary notice, package.json sets license to UNLICENSED with private true, and no CONTRIBUTING.md invites external contributions.

Related Skills

Explore More Software Engineering Skills→
shogo-labsshogo-labs
12

ship

Automate the ship workflow for software changes with tests, changelog updates, and PR creation.

Official
Advanced
ericdahl-devericdahl-dev

land-and-deploy

Automate deployment workflows for merged pull requests with CI/CD and canary releases.

Official
Advanced
AbildtoftAbildtoft
2

kramme:verify

Run formatting, linting, type-checking, builds, and tests on affected code.

Community
Intermediate
hung-phanhung-phan

trunk-based-development

Implement a trunk-based development workflow with short-lived branches and feature flags.

Community
Advanced