Files
skillshare/website/docs/commands/pull.md
T
Willie a248e758ab docs: update pull.md for merge-by-default and add v0.15.3 changelog
- pull.md: reflect new merge behavior when both sides have skills
- CHANGELOG: add v0.15.3 entries (multi-name audit, external-link
  rule, hub auth tokens, parallel scan, pull merge-by-default)
2026-02-22 15:13:10 +08:00

131 lines
2.7 KiB
Markdown

---
sidebar_position: 2
---
# pull
Pull from git remote and sync to all targets.
```bash
skillshare pull # Pull and sync
skillshare pull --dry-run # Preview
skillshare pull --force # Replace local with remote on first pull
```
## When to Use
- Sync skills from another machine that pushed changes
- Get the latest skills after someone else pushed updates
- Start working on a new machine after `init --remote`
## What Happens
```mermaid
flowchart TD
CMD["skillshare pull"]
CHECK["1. Check repository status"]
PULL["2. Pull from remote"]
SYNC["3. Sync to all targets"]
CMD --> CHECK --> PULL --> SYNC
```
## Options
| Flag | Description |
|------|-------------|
| `--dry-run, -n` | Preview without making changes |
| `--force, -f` | On first pull conflict, replace local skills with remote |
## Prerequisites
Your source directory must be a git repository with a remote:
```bash
# Check if ready:
skillshare status
# Shows: Git: initialized with remote
```
## Local Changes Warning
If you have uncommitted changes, `pull` will fail:
```bash
$ skillshare pull
Local changes detected
Run: skillshare push
Or: cd ~/.config/skillshare/skills && git stash
```
Solutions:
```bash
# Option 1: Push your changes first
skillshare push
skillshare pull
# Option 2: Stash your changes
cd ~/.config/skillshare/skills
git stash
skillshare pull
git stash pop
```
## First Pull with Existing Skills
On first pull (no upstream yet), if both local and remote already contain skill directories,
`pull` attempts a **merge** to combine both sides. If the merge succeeds, both local and remote skills are preserved.
If there are **merge conflicts**, `pull` fails with a non-zero exit code:
```bash
$ skillshare pull
Failed to merge remote history
Or force-pull: skillshare pull --force (replaces local with remote)
```
Resolve options:
```bash
# Resolve conflicts manually, then push
cd ~/.config/skillshare/skills
git add . && git commit
skillshare push
# Or discard local and take remote
skillshare pull --force
```
## Examples
```bash
# Standard pull (most common)
skillshare pull
# Preview what would happen
skillshare pull --dry-run
# Replace local with remote on first-pull conflict
skillshare pull --force
```
## Workflow
Typical workflow on a secondary machine:
```bash
# Start of day: get latest skills
skillshare pull
# ... work with AI tools ...
# End of day: share any new skills
skillshare collect claude # If you created new skills
skillshare push -m "Add new skill"
```
## See Also
- [push](/docs/commands/push) — Push to remote
- [sync](/docs/commands/sync) — Manual sync without pull
- [Cross-Machine Sync](/docs/guides/cross-machine-sync) — Full setup