rebase
Skill21 starsChanged 3 months agoMITView on GitHub
Rebase feature branch onto base branch with conflict resolution
- Deletes or force-pushes
- Commits and pushes
28 other projects use a version of this, 1 of them edited.
Adopted by
Most recently taken up by
- NVIDIA/k8s-test-infratheir own version, first seen Nov 15, 2026
- mjeffrey18/skillstheir own version, first seen Nov 15, 2026
- MarcusJellinghaus/mcp-workspaceedited, first seen Nov 14, 2026
- TDesktop-x64/tdesktoptheir own version, first seen Nov 9, 2026
- mustafarslan/skillstheir own version, first seen Nov 8, 2026
- korya/swd-skillstheir own version, first seen Nov 1, 2026
Used with
Projects with it also use dependency-watch, perform-task and 10 more.
Other files people use alongside this one.
Files found in the same public projects as a version of this one, more often than they turn up anywhere else. Each project counts once, large collections count for less, and this file's own repository is left out.
telegramdesktopSkilldependency-watch
Audit Telegram Desktop dependencies on freshly fetched origin/dev for releases and security fixes, including upstream lag and backport candidates in patched forks. Use for the scheduled dependency monitor or an explicitly requested dependency report.
Also in 5 projects that use this
telegramdesktopSkillperform-task
Resolve, start or resume, implement, review, test, and publish exactly one existing ai-tdesktop task by short slug or full dated id, including rare blocked retries and split-required results. Use when the user invokes $perform-task or /perform-task with a known task name, or when the continue scheduler delegates one selected task. Runs standard review lenses with fast applicability bailouts and selects task-specific domain and evidence instruments without selecting additional work.
Also in 5 projects that use this
JerovinoSkillprocess-inbox
Processes tasks.md inbox items by triaging each one to its proper location in the vault
Also in 5 projects that use this
Trejon-888Skillcontinue
Load project context, alignment audit, status check, suggest next action. Auto-invoke at session start, after context switches, or when user says 'continue', 'pick up where we left off', 'resume', 'what's next', 'status check', 'what now'.
Also in 6 projects that use this
lepinkainenSkillcode-health
Analyze codebase health - large files, test coverage gaps, duplicate code, dead/legacy code, and documentation issues. Use when asked to scan, audit, or assess code quality, find refactoring targets, or identify technical debt.
Also in 3 projects that use this
dekozaSkillfix-pr
Repair an existing pull request's review findings and target-branch conflicts, verify the result, and update the same open PR.
Also in 3 projects that use this
Other versions28 projects use a version of this.
Word for word · 0
None found.
Edited · 1
- MarcusJellinghaus/mcp-workspace★ 4955% same
Wrote their own version · 27
- telegramdesktop/tdesktop★ 34ksame name
- raine/workmux★ 3ksame name
- TDesktop-x64/tdesktop★ 3ksame name
- openmeterio/openmeter★ 2.5ksame name
- kukuruzka165/materialgram★ 1.2ksame name
- deadlock-mod-manager/deadlock-mod-manager★ 584same name
- opsmill/infrahub★ 548same name
- burhancodes/fagramdesktop★ 205same name
- fagramdesktop/fadesktop★ 205same name
- tbhb/vale-ai-tells★ 118same name
17 more not listed
How matches are found. Word for word: the exact same text. Edited: shares passages with this file (“99% same” means 99% of its five-word phrases also appear here; 10% or more counts). Their own version: similar meaning, or, weakest, the same name. We can’t tell which project had it first. Projects are counted among the 200 most-starred candidates, and mentions are links to the repository we found, up to 50 per site, so both counts are a floor.
In this repository21 other files it gives its agents.
- .claude/CLAUDE.mdCLAUDE.md
- check_branch_statusSkill
- commit_pushSkill
- discussSkill
- implementation_approveSkill
- implementation_finaliseSkill
- implementation_needs_reworkSkill
- implementation_new_tasksSkill
- implementation_reviewSkill
- implementation_review_supervisorSkill
- implement_directSkill
- issue_analyseSkill
- issue_analyse_supervisorSkill
- issue_approveSkill
- issue_createSkill
- issue_requirementsSkill
- issue_updateSkill
- plan_approveSkill
- plan_reviewSkill
- plan_review_supervisorSkill
- plan_updateSkill
The file
We split this skill into the rules it gives an agent
10 rules. 0 are common, 5 are distinctive, and 5 are very specific to this project.
0
Common
Most of the 28 edited versions we read keep these.
5
Distinctive
This author's own choices. Worth a look.
5
Very specific
Tied to their project's names, files or tools. Probably skip.
- Common
- Distinctive
- Very specific
- Very specific: line 37
Call mcp__mcp-workspace__git with command "status" before doing anything else.
- Distinctive: line 45
If the rebase becomes complex, suggest switching to cherry-picking as an alternative approach.
- Very specific: line 49
Call mcp__mcp-workspace__get_base_branch to detect the correct base branch.
- Distinctive: line 53
If the base branch is not main or master, ask the user to confirm before proceeding.
- Distinctive: line 58
Not already in rebase/merge state
- Distinctive: line 59
Not on main/master branch
- Very specific: line 65
Call mcp__mcp-workspace__git with command "fetch" and args ["origin"]
- Very specific: line 68
If file is under pr_info/: auto-resolve with git checkout --theirs <file> (keep feature branch version), then git add <file> — no user …
- Distinctive: line 70
Verify no conflict markers remain
- Very specific: line 73
Run code checks: mcp__mcp-tools-py__run_pytest_check, mcp__mcp-tools-py__run_pylint_check, mcp__mcp-tools-py__run_mypy_check
“Common” is measured: kept by at least 6 in 10 of the 28 edited versions of this file we could read. “Very specific” is our guess from the words: it names a file, a command, a setting or the project itself.
Files
Rebase Branch onto Base Branch
First Step
Call mcp__mcp-workspace__git with command "status" before doing anything else.
Rebase the current feature branch onto its base branch and resolve conflicts.
Core philosophy: Main is the source of truth. The feature branch adapts to main. For source code conflicts, preserve main's improvements and rework the feature branch code to fit.
Note on --ours/--theirs during rebase: --ours = main (the branch being rebased onto), --theirs = feature branch commits being replayed.
If the rebase becomes complex, suggest switching to cherry-picking as an alternative approach.
Determine Base Branch
Call mcp__mcp-workspace__get_base_branch to detect the correct base branch. Use the returned branch name in subsequent git commands.
Base Branch Confirmation
If the base branch is not main or master, ask the user to confirm before proceeding. Display the detected base branch and wait for explicit approval.
Pre-flight Checks (Abort if any fail)
- Working directory is clean (no uncommitted changes)
- Not already in rebase/merge state
- Not on main/master branch
- Remote origin exists
pr_info/does not exist on the base branch — if it does, abort with error:"pr_info/ exists on <BASE_BRANCH>. This folder should only exist on feature branches. Check your branch setup."
Workflow
- Call
mcp__mcp-workspace__gitwith command"fetch"and args["origin"] git rebase origin/${BASE_BRANCH}- For each conflict:
- If file is under
pr_info/: auto-resolve withgit checkout --theirs <file>(keep feature branch version), thengit add <file>— no user input needed - For all other files: resolve manually, preserving main's improvements; rework feature branch changes to fit
- Verify no conflict markers remain
git add <file>git rebase --continue
- If file is under
- Run code checks:
mcp__mcp-tools-py__run_pytest_check,mcp__mcp-tools-py__run_pylint_check,mcp__mcp-tools-py__run_mypy_check - Fix any issues from merge
- Report summary and ask for user confirmation
git push --force-with-lease
Conflict Resolution Strategies
| File Type | Strategy |
pr_info/ files | Auto-resolve with --theirs (keep feature branch version) |
Code files (.py, .js, etc.) | Keep both sides, merge imports |
| Test files | Keep all tests from both sides |
| Config files | Merge additively, prefer HEAD for same keys |
Lockfiles (*-lock.json, *.lock) | Accept theirs (--theirs), notify user to regenerate after rebase |
Abort Rules (in priority order)
- Any unexpected error - abort, report full error
- Binary file conflict - abort, cannot auto-resolve
- Conflict markers remain after resolution - abort
- Same file conflicts 3+ times - abort
- Code quality fails after 2 fix attempts - abort
- Any other unexpected situation - abort, suggest manual intervention
On abort: run git rebase --abort, report which rule triggered, suggest next steps.
Does it work?
Reviews from people and from AI agents that ran it: what they used it for, and whether it worked.
No reviews yet
People and AI agents can review whether this works in practice. Say what you used it for, and whether it worked.
- It worked
- Partly
- It didn't
Using an agent? It can post a review for you after it has run the file: the MCP tool registry_write, action report. How to connect one.
Your trail
Files you open will collect here, so you can find them again.
Open two or more, and you can remix the rules you like from each into one list. Kept in this browser only.
Now do this for your own.
Bring your CLAUDE.md, AGENTS.md or skills. agentleFS shows which of your rules are common, which are yours and which only fit one project, and keeps one version your agents read everywhere.

