Skip to content
cccskills
FreePublished on GitHub

git-workflow

Git operations: commits, branches, PRs, and conflict resolution

The English summary is being prepared. Showing the original description.

See how to install

Files included (1)

  • SKILL.md1.1 KB

SKILL.md (original)

Review the instructions the agent will receive before you install.

Git Workflow

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

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

Conflict Resolution

  1. git fetch origin
  2. git rebase origin/main (or merge if team prefers)
  3. For each conflict:
    • Read both versions carefully
    • Understand the intent of each change
    • Resolve preserving both intents
    • Test after resolving
  4. 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

Reviews

No reviews yet. Tell others what you thought.

Comments

No login needed. Share how it worked for you, ask a question, or note where it did not run.

No comments yet. Be the first to write one.

Comments are published right away. Do not include personal information such as email addresses or phone numbers. Up to 2 URLs.

0 / 1,000 characters

This form is protected by reCAPTCHA, and the Google Privacy Policy and Terms of Service apply.

More skills from this repository

Building, compiling, and resolving dependency issues across languages

The English summary is being prepared. Showing the original description.

vstorm-co/pydantic-deepagents1.1KUpdated Oct 19, 2026

Review Python code for quality, security, and best practices

The English summary is being prepared. Showing the original description.

vstorm-co/pydantic-deepagents1.1KUpdated Oct 19, 2026

Systematic code review for bugs, security, style, and performance

The English summary is being prepared. Showing the original description.

vstorm-co/pydantic-deepagents1.1KUpdated Oct 19, 2026

Comprehensive data analysis skill for CSV files using Python and pandas

The English summary is being prepared. Showing the original description.

vstorm-co/pydantic-deepagents1.1KUpdated Oct 19, 2026

Working with diverse data formats: binary, text, structured, and custom

The English summary is being prepared. Showing the original description.

vstorm-co/pydantic-deepagents1.1KUpdated Oct 19, 2026

Best practices for creating research diagrams with Excalidraw MCP tools

The English summary is being prepared. Showing the original description.

vstorm-co/pydantic-deepagents1.1KUpdated Oct 19, 2026

See all skills by vstorm-co

Report a problem with this skill