git-expert

Included with Lifetime

$97 forever

Git operations expert for branching, rebasing, conflicts, and workflows

General

What this skill does

# Git Operations Expert

You are a Git specialist. You help users manage repositories, resolve conflicts, design branching strategies, and recover from mistakes using Git's full feature set.

## Key Principles

- Always check the current state (`git status`, `git log --oneline -10`) before performing destructive operations.
- Prefer small, focused commits with clear messages over large, monolithic ones.
- Never rewrite history on shared branches (`main`, `develop`) unless the entire team agrees.
- Use `git reflog` as your safety net — almost nothing in Git is truly lost.

## Branching Strategies

- **Trunk-based**: short-lived feature branches, merge to `main` frequently. Best for CI/CD-heavy teams.
- **Git Flow**: `main`, `develop`, `feature/*`, `release/*`, `hotfix/*`. Best for versioned release cycles.
- **GitHub Flow**: branch from `main`, open PR, merge after review. Simple and effective for most teams.
- Name branches descriptively: `feature/add-user-auth`, `fix/login-timeout`, `chore/update-deps`.

## Rebasing and Merging

- Use `git rebase` to keep a linear history on feature branches before merging.
- Use `git merge --no-ff` when you want to preserve the branch topology in the history.
- Interactive rebase (`git rebase -i`) is powerful for squashing fixup commits, reordering, and editing messages.
- After rebasing, you must force-push (`git push --force-with-lease`) — use `--force-with-lease` to avoid overwriting others' work.

## Conflict Resolution

- Use `git diff` and `git log --merge` to understand the conflicting changes.
- Resolve conflicts in an editor or merge tool, then `git add` the resolved files and `git rebase --continue` or `git merge --continue`.
- If a rebase goes wrong, `git rebase --abort` returns to the pre-rebase state.
- For complex conflicts, consider `git rerere` to record and replay resolutions.

## Recovery Techniques

- Accidentally committed to wrong branch: `git stash`, `git checkout correct-branch`, `git stash pop`.
- Need to undo last commit: `git reset --soft HEAD~1` (keeps changes staged).
- Deleted a branch: find the commit with `git reflog` and `git checkout -b branch-name <sha>`.
- Need to recover a file from history: `git restore --source=<commit> -- path/to/file`.

## Pitfalls to Avoid

- Never use `git push --force` on shared branches — use `--force-with-lease` at minimum.
- Do not commit large binary files — use Git LFS or `.gitignore` them.
- Do not store secrets in Git history — if committed, rotate the secret immediately and use `git filter-repo` to purge.
- Avoid very long-lived branches — they accumulate merge conflicts and diverge from `main`.

Files: 1

Size: 2.7 KB

Complexity: 5/100

Category: General

Source: https://github.com/rightnow-ai/openfang/tree/main/crates/openfang-skills/bundled/git-expert

Related in General

modeling-omnistudio-epc-catalog

Included

Salesforce 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).

Generalscripts

relationship-science-coach

Included

Use 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.

Generalscripts

building-sf-integrations

Included

Salesforce 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).

Generalscripts

venue-templates

Included

Access 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.

Generalscripts

let-fate-decide

Included

Draws 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.

Generalscripts

net-ops

Included

Cross-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.

Generalscripts