heyayushh/rebase
configs/commands/skills/rebase/SKILL.md
Rebase the current branch with flexible target options. Use when you need to rebase on main, a specific branch, or a remote branch, with intelligent conflict handling.
$ install --global
skillsauthnpx skillsauth add heyayushh/stacc rebaseInstall this skill globally with one command. Works with Claude Code, Cursor, and Windsurf.
Security Scan Results
3 of 9 scanners reported clean
Some scanners were skipped, did not run, or reported a non-clean status. Review each row below.
3
Scanners Passed
9
Scanners in report
Clean
TrivyContainer and dependency vulnerability scanner
95%
Clean
SemgrepStatic code analysis for vulnerabilities
95%
Clean
mcp-scan (Snyk)Model Context Protocol security validation
95%
Skipped
Snyk (dep)Open source security scanning
50%
Skipped
Socket.devSupply chain security analysis
50%
Skipped
VirusTotalMulti-engine malware detection
50%
Skipped
CrowdStrikeAdvanced threat intelligence
50%
Skipped
OSV-ScannerOpen Source Vulnerability database check
50%
Skipped
OWASP Dep-Check
50%
Last scanned: May 13, 2026, 2:29 AM286.6s1 file scanned
SKILL.md
- name:
- rebase
- description:
- Rebase the current branch with flexible target options. Use when you need to rebase on main, a specific branch, or a remote branch, with intelligent conflict handling.
Rebase
Rebase the current branch.
Arguments
- No arguments: rebase on local main
origin: fetch origin, rebase on origin/mainorigin/branch: fetch origin, rebase on origin/branchbranch: rebase on local branch
Steps
-
Parse arguments
- No args → target is "main", no fetch
- Contains "/" (e.g., "origin/develop") → split into remote and branch, fetch remote, target is remote/branch
- Just "origin" → fetch origin, target is "origin/main"
- Anything else → target is that branch name, no fetch
-
Fetch if needed
git fetch <remote> -
Rebase
git rebase <target> -
Handle conflicts (if any)
-
Continue until complete
Handling Conflicts
- BEFORE resolving any conflict, understand changes made to each conflicting file in the target branch
- For each conflicting file:
git log -p -n 3 <target> -- <file> - Goal: preserve BOTH target branch changes AND our branch's changes
- After resolving each conflict:
git add <file> git rebase --continue - If a conflict is too complex or unclear, ask for guidance before proceeding
Related Skills
heyayushh/frontend-design
development
VerifiedTrustedCommunity
Create distinctive, production-grade frontend interfaces with high design quality. Use this skill when the user asks to build web components, pages, artifacts, posters, or applications (examples include websites, landing pages, dashboards, React components, HTML/CSS layouts, or when styling/beautifying any web UI). Generates creative, polished code and UI design that avoids generic AI aesthetics.
2SKILL.mdUpdated May 13, 2026
heyayushh/swiftui-view-refactor
development
VerifiedTrustedCommunity
Refactor and review SwiftUI view files for consistent structure, dependency injection, and Observation usage. Use when asked to clean up a SwiftUI view’s layout/ordering, handle view models safely (non-optional when possible), or standardize how dependencies and @Observable state are initialized and passed.
2SKILL.mdUpdated May 13, 2026
heyayushh/swiftui-ui-patterns
development
VerifiedTrustedCommunity
Best practices and example-driven guidance for building SwiftUI views and components. Use when creating or refactoring SwiftUI UI, designing tab architecture with TabView, composing screens, or needing component-specific patterns and examples.
2SKILL.mdUpdated May 13, 2026
heyayushh/swiftui-performance-audit
development
VerifiedTrustedCommunity
Audit and improve SwiftUI runtime performance from code review and architecture. Use for requests to diagnose slow rendering, janky scrolling, high CPU/memory usage, excessive view updates, or layout thrash in SwiftUI apps, and to provide guidance for user-run Instruments profiling when code review alone is insufficient.
2SKILL.mdUpdated May 13, 2026