git-workflow-and-versioning
Trunk-based development, atomic commits, change sizing (~100 lines), commit-as-save-point pattern. Use when making any code change.
What this skill does
# Git Workflow and Versioning ## Overview Use trunk-based development with atomic commits. Keep changes small, write clear commit messages, and treat every commit as a save point that could be deployed independently. ## When to Use - Every code change, without exception ## Core Principles ### Trunk-Based Development - Work on short-lived feature branches - Merge to main frequently (at least daily) - Keep branches small and focused - Use feature flags for incomplete work ### Atomic Commits Each commit should: - Contain one logical change - Leave the codebase in a buildable, testable state - Be revertable without breaking other work ### Change Sizing - Target ~100 lines per change for easy review - Maximum ~400 lines unless the change is mechanical (renames, generated code) - If a change is too large, break it into smaller sequential commits ### Commit-as-Save-Point Treat each commit as a checkpoint: - All tests pass at each commit - The system is deployable at each commit - Each commit message explains what and why ## Commit Message Format ``` type: short description (50 chars max) - What changed - Why it changed - Any relevant context Refs: #issue-number ``` Types: `feat`, `fix`, `refactor`, `docs`, `test`, `chore`, `perf`, `ci` ## Process ### Step 1: Create Feature Branch ```bash git checkout -b feat/short-description main ``` ### Step 2: Make Atomic Commits - Stage related changes together - Write a clear commit message - Run tests before committing - Push after each meaningful milestone ### Step 3: Keep Branch Up to Date ```bash git fetch origin main git rebase origin/main ``` Resolve conflicts promptly. Do not let branches diverge for days. ### Step 4: Create Pull Request - Write a clear description of what changed and why - Include a test plan - Keep PRs small enough for thorough review ## Common Rationalizations | Rationalization | Reality | |---|---| | "I will commit everything at the end" | A single large commit is hard to review, hard to revert, and loses intermediate context. | | "WIP commits are fine, I will squash later" | If you squash, you lose the save points. If you don't, you merge messy history. | | "This change is too small for its own commit" | Small changes are exactly what make good atomic commits. | ## Verification - [ ] Each commit is one logical change - [ ] Tests pass at each commit - [ ] Commit messages follow the format - [ ] Branch is up to date with main - [ ] PR description includes test plan ## Anti-Rationalization Table | Excuse | Counter | |--------|---------| | "I'll commit everything at the end" | A single large commit is hard to review, hard to revert, and loses intermediate context. | | "WIP commits are fine, I'll squash later" | If you squash, you lose the save points. If you don't, you merge messy history. | | "This change is too small for its own commit" | Small changes are exactly what make good atomic commits. | | "I'll rebase later when the branch is done" | Letting branches diverge creates painful merge conflicts. Rebase frequently. | | "Feature flags are overkill for this" | Feature flags enable merging incomplete work safely. They prevent long-lived branches. |
Related in General
modeling-omnistudio-epc-catalog
IncludedSalesforce Industries CME EPC product-modeling skill for Product2-based catalog creation. Use when creating EPC products, configuring product attributes, building offer bundles with Product Child Items, or reviewing EPC DataPack JSON metadata for product catalog changes. TRIGGER when: user creates or updates Product2 EPC records, AttributeAssignment payloads, AttributeMetadata/AttributeDefaultValues, Offer bundles, or ProductChildItem relationships. DO NOT TRIGGER when: designing OmniScripts/FlexCards/Integration Procedures (use building-omnistudio-omniscript, building-omnistudio-flexcard, or building-omnistudio-integration-procedure), implementing Apex business logic (use generating-apex), or troubleshooting deployment pipelines (use deploying-metadata).
relationship-science-coach
IncludedUse this skill for direct, practical adult relationship coaching: couples conflict, repair, trust, marriage, dating, flirting, attachment patterns, emotional connection, sex, desire differences, eroticism, kink negotiation, affection, love languages, breakups, and long-term passion. Draw on Gottman, EFT and Hold Me Tight, attachment science, modern sex research, Perel, Nagoski, Kerner, Schnarch, Love and Stosny, and flexible love-language tools. Be concrete and low-hedge. Redirect only for imminent danger, abuse, coercive control, minors, non-consent, self-harm, stalking, or medical/legal/psychiatric decisions.
building-sf-integrations
IncludedSalesforce integration architecture and runtime plumbing with 120-point scoring. Use this skill to set up Named Credentials, External Credentials, External Services, REST/SOAP callout patterns, Platform Events, and Change Data Capture. TRIGGER when: user sets up Named Credentials, External Services, REST/SOAP callouts, Platform Events, CDC, or touches .namedCredential-meta.xml files. DO NOT TRIGGER when: Connected App/OAuth config (use configuring-connected-apps), Apex-only logic (use generating-apex), or data import/export (use handling-sf-data).
venue-templates
IncludedAccess comprehensive LaTeX templates, formatting requirements, and submission guidelines for major scientific publication venues (Nature, Science, PLOS, IEEE, ACM), academic conferences (NeurIPS, ICML, CVPR, CHI), research posters, and grant proposals (NSF, NIH, DOE, DARPA). This skill should be used when preparing manuscripts for journal submission, conference papers, research posters, or grant proposals and need venue-specific formatting requirements and templates.
let-fate-decide
IncludedDraws the 12 Houses of the Zodiac Tarot spread to inject entropy into planning when prompts are vague, ambiguous, or casually delegated. Interprets the spread to guide next steps. Use when the user says 'let fate decide', 'YOLO', 'whatever', 'idk', or other nonchalant phrases, makes Yu-Gi-Oh references, or when you are about to arbitrarily pick between multiple reasonable approaches. Prefer over ask-questions-if-underspecified when the user's tone is casual or playful rather than precision-seeking.
net-ops
IncludedCross-platform network troubleshooting (Windows, macOS, Linux) via local or remote shell. Use for: DNS broken, can't resolve hostnames, nslookup/dig works but apps fail, NRPT, WFP, scutil, /etc/resolver, systemd-resolved, /etc/resolv.conf, NetworkManager, VPN DNS leak residue (ProtonVPN/Mullvad/WireGuard/AnyConnect), AV/firewall blocking DNS or DoH, Tailscale DNS interaction, intermittent connectivity, remote diagnostics over SSH.