feat(skills): restore 60 bundled skills (#42)
* feat(skills): restore ansible skill * feat(skills): restore api-tester skill * feat(skills): restore aws skill * feat(skills): restore azure skill * feat(skills): restore ci-cd skill * feat(skills): restore code-reviewer skill * feat(skills): restore compliance skill * feat(skills): restore confluence skill * feat(skills): restore crypto-expert skill * feat(skills): restore css-expert skill * feat(skills): restore data-analyst skill * feat(skills): restore data-pipeline skill * feat(skills): restore docker skill * feat(skills): restore elasticsearch skill * feat(skills): restore email-writer skill * feat(skills): restore figma-expert skill * feat(skills): restore gcp skill * feat(skills): restore git-expert skill * feat(skills): restore github skill * feat(skills): restore golang-expert skill * feat(skills): restore graphql-expert skill * feat(skills): restore helm skill * feat(skills): restore interview-prep skill * feat(skills): restore jira skill * feat(skills): restore kubernetes skill * feat(skills): restore linear-tools skill * feat(skills): restore linux-networking skill * feat(skills): restore llm-finetuning skill * feat(skills): restore ml-engineer skill * feat(skills): restore mongodb skill * feat(skills): restore nextjs-expert skill * feat(skills): restore nginx skill * feat(skills): restore notion skill * feat(skills): restore oauth-expert skill * feat(skills): restore openapi-expert skill * feat(skills): restore pdf-reader skill * feat(skills): restore postgres-expert skill * feat(skills): restore presentation skill * feat(skills): restore project-manager skill * feat(skills): restore prometheus skill * feat(skills): restore prompt-engineer skill * feat(skills): restore python-expert skill * feat(skills): restore react-expert skill * feat(skills): restore redis-expert skill * feat(skills): restore regex-expert skill * feat(skills): restore rust-expert skill * feat(skills): restore security-audit skill * feat(skills): restore sentry skill * feat(skills): restore shell-scripting skill * feat(skills): restore slack-tools skill * feat(skills): restore sql-analyst skill * feat(skills): restore sqlite-expert skill * feat(skills): restore sysadmin skill * feat(skills): restore technical-writer skill * feat(skills): restore terraform skill * feat(skills): restore typescript-expert skill * feat(skills): restore vector-db skill * feat(skills): restore wasm-expert skill * feat(skills): restore web-search skill * feat(skills): restore writing-coach skill
This commit is contained in:
60 files changed
+2474
No files matched your search
@@ -0,0 +1,49 @@
|
||||
---
|
||||
name: git-expert
|
||||
description: Git operations expert for branching, rebasing, conflicts, and workflows
|
||||
---
|
||||
# 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`.
|
||||
Reference in new issue
Block a user