rebase-on-main
Rebase the current feature branch onto local main to pick up recent main changes without merging. Verifies no main content is lost during conflict resolution.
- License 许可
- MIT
- 所属仓库
- kfet/fir
- 最近更新
- 2026-11-13
- Stars
- ★ 1
- Forks
- 0
01 前言 Front Matter
- name
- rebase-on-main
- builtin
- true
- override
- true
- description
- Rebase the current feature branch onto local main to pick up recent main changes without merging. Verifies no main content is lost during conflict resolution.
03 SKILL.md 正文
git rebase main. When conflicts arise, preserve main's content and re-apply only the feature's intended changes on top.- Verify the diff —
git diff main..HEAD. Confirm it contains only the feature's intended changes and nothing that removes or reverts existing main content. If main changes were dropped, abort and fix. - Update CHANGELOG.md — ensure all commits being rebased have corresponding entries in the
[Unreleased]section. Add any missing ones under the appropriate subsection (Added/Changed/Fixed/Removed). Verify they are under## [Unreleased], not merely present: rebasing across a release boundary silently relocates them into the just-released section, conflict-free, and step 2's diff still looks clean (pure additions, zero deletions). Readsed -n '1,40p' CHANGELOG.mdand confirm each entry sits above the first## [x.y.z]heading; move any that don't. - Build — run
make allto confirm nothing broke.
04 同仓库更多 Skills
wt
Spawn a fresh fir agent in its own tmux session on its own git worktree. Use whenever the user wants the work — or the conversation about the work — to happen over there, not here. If the user points at this skill, or has directly loaded it in the context, that alone is the cue — spawn, don't inline.
wrap-up
Wrap up work on a project branch — review, fix, and simplify in a loop until clean, then ff-merge to main.
tmux-observer
Attach a tmux window to an already-running fir session — observe its transcript and drive its input via tmux send-keys. Use when you need to watch or steer another fir agent.
tmux-driver
Drive interactive CLIs (python, gdb, etc.) via named tmux sessions with multi-window support. Falls back to fir's built-in PTY driver when tmux is unavailable.
telegram-bot-setup
Set up a new Telegram bot channel for a fir project — install the telegram MCP, create a per-project state dir, drop in the bot token, wire .fir/mcp.json with TELEGRAM_STATE_DIR, pair the user, and verify. Use when the user asks to add, configure, or onboard a Telegram bot for a fir worktree/project.
sync
Sync with an upstream source repo — detect changed files, apply equivalent downstream edits, update the baseline, and report any new features or non-trivial changes picked up.