https://github.com/buvis/claude-git-ferry
Git workflow skills for Claude Code: branch catchup, upstream sync, conflict resolution, CI watching, GitHub issue sync, and dependency PR triage.
https://github.com/buvis/claude-git-ferry
Last synced: about 2 months ago
JSON representation
Git workflow skills for Claude Code: branch catchup, upstream sync, conflict resolution, CI watching, GitHub issue sync, and dependency PR triage.
- Host: GitHub
- URL: https://github.com/buvis/claude-git-ferry
- Owner: buvis
- License: mit
- Created: 2026-05-11T09:43:27.000Z (3 months ago)
- Default Branch: master
- Last Pushed: 2026-05-13T07:26:56.000Z (3 months ago)
- Last Synced: 2026-05-13T09:28:06.141Z (3 months ago)
- Language: Shell
- Size: 31.3 KB
- Stars: 0
- Watchers: 0
- Forks: 0
- Open Issues: 0
-
Metadata Files:
- Readme: README.md
- Changelog: CHANGELOG.md
- License: LICENSE
Awesome Lists containing this project
README
[](LICENSE)
# git-ferry
> Skills that carry you across git's awkward crossings: branch context, upstream drift, merge conflicts, CI waits, GitHub busywork.
## What's inside
| Skill | Triggers on |
|---|---|
| `catchup` | "catchup", "what changed on this branch", "project overview", "refresh capsule" |
| `catchup-upstream` | "sync upstream", "catchup upstream", "sync fork", "check upstream" |
| `resolve-git-conflicts` | merge/rebase/cherry-pick/stash conflicts; "unmerged paths", "rebase in progress" |
| `watch-ci` | "watch CI", "wait for CI", "check CI", "are checks passing", "monitor build" |
| `sync-plan-issue` | "sync plan to github", "update issue with plan", "share plan", "create issue from plan" |
| `review-deps-prs` | "review deps", "check dep updates", "dependency prs", "dep updates" |
## Install
```
/plugin marketplace add buvis/claude-plugins
/plugin install git-ferry@buvis-plugins
```
## Update
```
/plugin update git-ferry@buvis-plugins
```
## Alternative: install directly from this repo
```
/plugin marketplace add buvis/claude-git-ferry
/plugin install git-ferry@claude-git-ferry
```
## Why "git-ferry"
A ferry's job is unglamorous: get you from one bank to the other without losing cargo. These skills are the same — they shuttle you across branch boundaries, upstream drift, conflict resolution, and CI gates. Nothing flashy; just safe passage.
## License
MIT