Automated summary
Performs an intelligent git pull with automatic conflict management, stashing of local changes, and a detailed report.
Strengths
- Automatically handles uncommitted local changes via stash
- Detects and analyzes conflicts with clear explanations
- Offers resolution options (ours/theirs/manual)
- Supports --rebase, --force, and --dry-run options
Limitations
- Relies solely on Git command line
- Does not replace manual review of complex conflicts
- The --force option can lead to data loss if misused
When you need to sync a Git branch with uncommitted local changes and want guided conflict resolution.
If you prefer to resolve conflicts manually in your IDE or use an advanced rebase workflow that requires fine-grained human intervention.
Security analysis
SafeThe skill uses only safe git commands for pulling, stashing, and conflict resolution. Forceful actions require user confirmation, and there is no risk of data exfiltration or system compromise.
No concerns found
How this analysis is madeExamples
Pull la branche courante avec gestion des conflitsPull avec rebase pour éviter un merge commitSimuler un pull --force sans exécutername: pull description: Git pull intelligent avec gestion automatique des conflits, stash, et rapport détaillé disable-model-invocation: true argument-hint: "[--rebase|--force|--dry-run]" allowed-tools: Bash(git:*)
Pull Git avec gestion des conflits
Rôle
Assistant Git qui effectue un git pull intelligent avec gestion automatique des conflits.
Processus
1. Vérification préalable
git status
git branch --show-current
git diff --stat
2. Stratégie selon l'état
Si changements non commités :
git stash push -m "Auto-stash before pull $(date +%Y%m%d_%H%M%S)"
git pull
git stash pop
Si clean :
git pull
3. Détection des conflits
git status | grep "both modified"
git diff --name-only --diff-filter=U
4. Gestion des conflits
Si conflits détectés :
- Lister les fichiers en conflit avec leur contenu
- Analyser les conflits :
- Montrer les sections en conflit
- Expliquer les différences entre LOCAL et REMOTE
- Proposer des solutions :
- Garder LOCAL :
git checkout --ours <file> - Garder REMOTE :
git checkout --theirs <file> - Merger manuellement avec aide
- Garder LOCAL :
- Finaliser :
git add <fichiers-résolus> git commit -m "Merge: résolution des conflits après pull"
5. Rapport final
Afficher :
- Branche synchronisée
- Nombre de commits pulled
- Fichiers modifiés
- Conflits résolus (si applicable)
Options via $ARGUMENTS
--rebase: Utilisergit pull --rebaseau lieu de merge--force: Forcer le pull (écrasera les changements locaux)--dry-run: Simuler sans exécuter
Sécurité
- Toujours proposer avant d'écraser des changements locaux
- Créer un stash automatique en cas de doute
- Demander confirmation pour
--force - Afficher clairement les conflits avant résolution
From the file to a first result
The download contains exactly the content displayed on this page. This copy may differ from the latest version in the source repository.
View the source and supporting filesThis download contains SKILL.md only. Any scripts, references, templates and dependencies are not included. Get the required files from the source, preserving their directory structure, before continuing.
1. Download the file
Download SKILL.mdFrom the root of a test project, save the file as .skill-downloads/intelligent-git-pull-with-conflict-management-mm5t8aqc/SKILL.md, or use the command below. This folder is for inspecting the skill before installation.
Command for macOS/Linux or WSL: requires a POSIX shell and curl. On Windows without WSL, use the download button and create the folder manually.
mkdir -p '.skill-downloads/intelligent-git-pull-with-conflict-management-mm5t8aqc' && curl --fail --show-error --location 'https://skills-guides.com/api/skills/intelligent-git-pull-with-conflict-management-mm5t8aqc/download' --output '.skill-downloads/intelligent-git-pull-with-conflict-management-mm5t8aqc/SKILL.md.part' && mv '.skill-downloads/intelligent-git-pull-with-conflict-management-mm5t8aqc/SKILL.md.part' '.skill-downloads/intelligent-git-pull-with-conflict-management-mm5t8aqc/SKILL.md'2. Check prerequisites
Read SKILL.md before using it. If it references scripts or external services, inspect them and prepare the required access in your test environment.
Tools declared by the author (check availability in your agent): Bash(git:*)
No recognized prerequisites section in this file. This does not mean it is self-contained: libraries, tools and access requirements may be mentioned elsewhere in the content or source repository.
The platforms on this page are catalog indications. The paths below follow tool documentation; they do not prove this skill has been run in those tools. No minimum tool version is confirmed for this listing.
3. Load the skill
After inspection, copy the complete folder into your project using one of the commands below, then open a new tool session. The command stops if a folder with the same name already exists: compare the files before replacing it.
Claude Code
test -f '.skill-downloads/intelligent-git-pull-with-conflict-management-mm5t8aqc/SKILL.md' && test -s '.skill-downloads/intelligent-git-pull-with-conflict-management-mm5t8aqc/SKILL.md' && mkdir -p '.claude/skills' && test ! -e '.claude/skills/pull' && cp -R '.skill-downloads/intelligent-git-pull-with-conflict-management-mm5t8aqc' '.claude/skills/pull'OpenSkills
OpenSkills must already be installed. The local install/read procedure is checked with OpenSkills 1.5.0, which requires Node.js ≥ 20.6.0. Catalog slugs are not resolved automatically.
Official OpenSkills installationopenskills install './.skill-downloads/intelligent-git-pull-with-conflict-management-mm5t8aqc'openskills read 'intelligent-git-pull-with-conflict-management-mm5t8aqc'Reading should display the installed file content and its base directory. It does not run the skill or install its dependencies.
For an agent that reads AGENTS.md, then sync the index. This command changes AGENTS.md: review the diff before using it.
openskills syncManual method or another tool: attach SKILL.md to a conversation, or open it in an agent that can read files. Include any required supporting resources. No universal folder is recognized by every tool.
4. Try a first task
Use a short, synthetic input: an API endpoint, a small document or an interface brief. In a new conversation, attach the file or give the agent its path, then adapt this request:
Read .skill-downloads/intelligent-git-pull-with-conflict-management-mm5t8aqc/SKILL.md and apply its instructions to this example: [describe a test input]. Identify any missing files, dependencies or access. Produce the result requested by the skill without inventing data or running unreviewed scripts.Expected result: output matching the skill instructions, or a precise list of missing prerequisites. A read confirmation alone does not validate a first use. If an external resource is unavailable, that path remains untested.
React Hook Form Best Practices
Development
Master React Hook Form: avoid anti-patterns, manage subscriptions, and handle reset, dirty state, and controlled inputs correctly.
Emotion to Mantine Migration
Development
Migrate Emotion styled-components to Mantine components with style props and CSS modules. Use when converting .styled.tsx files or removing @emotion imports.
Scope Creep Detector
Development
Analyzes git diffs against a stated intent to detect scope creep, unrelated files, broad PRs, and oversized changes, then suggests keep, split, or justify actions.