# worktree-sync

> Sync git worktrees with remote and main branch changes. Use to keep long-running feature branches up-to-date.

- Author: dependabot[bot]
- Repository: HomericIntelligence/ProjectOdyssey
- Version: 20260127140744
- Stars: 0
- Forks: 0
- Last Updated: 2026-02-08
- Source: https://github.com/HomericIntelligence/ProjectOdyssey
- Web: https://mule.run/skillshub/@@HomericIntelligence/ProjectOdyssey~worktree-sync:20260127140744

---

---
name: worktree-sync
description: "Sync git worktrees with remote and main branch changes. Use to keep long-running feature branches up-to-date."
mcp_fallback: none
category: worktree
---

# Worktree Sync

Keep worktrees synchronized with remote changes.

## When to Use

- Long-running feature branches
- Main branch has new commits
- Before creating/updating PR
- Resolving merge conflicts
- Feature branch is diverged from main

## Quick Reference

```bash
# Fetch latest from remote (works in any worktree)
git fetch origin

# Update main worktree
cd ../ProjectOdyssey && git pull origin main

# Update feature worktree (rebase approach)
cd ../ProjectOdyssey-42-feature && git rebase origin/main

# Update feature worktree (merge approach)
cd ../ProjectOdyssey-42-feature && git merge origin/main

# Auto-sync all worktrees
./scripts/sync_all_worktrees.sh
```

## Workflow

1. **Fetch remote** - `git fetch origin` (any worktree)
2. **Update main** - Navigate to main worktree, `git pull origin main`
3. **Update feature** - Navigate to feature worktree, `git rebase origin/main` or `git merge`
4. **Resolve conflicts** - If conflicts occur, fix files and `git rebase --continue`
5. **Verify** - Check `git log` to confirm main branch changes are included

## Rebase vs Merge

| Approach | Use When | Command |
|----------|----------|---------|
| Rebase | Linear history preferred | `git rebase origin/main` |
| Merge | Preserving branch history | `git merge origin/main` |

## Error Handling

| Error | Solution |
|-------|----------|
| Conflicts during rebase | Run `git status`, fix files, `git add .`, `git rebase --continue` |
| Diverged branches | Use `git pull --rebase origin main` |
| Uncommitted changes | Commit or stash before syncing |
| Detached HEAD | Check `git status` and `git checkout <branch>` |

## Conflict Resolution

```bash
# If conflicts occur
git status  # See conflicted files

# Edit files to resolve conflicts
# Then continue
git add .
git rebase --continue

# Or abort if something went wrong
git rebase --abort
```

## Best Practices

- Fetch regularly to catch conflicts early
- Sync before creating PR to avoid merge conflicts
- Keep feature branches short-lived (2-3 days max)
- Resolve conflicts immediately
- Use rebase for linear history (preferred for this project)

## References

- See `worktree-create` skill for creating worktrees
- [worktree-strategy.md](../../../notes/review/worktree-strategy.md)