Rebasing Branches

Rebase Workflow Knowledge Base

This skill provides knowledge and strategy for rebasing feature branches onto a development branch. For automated execution, use the lt-dev:branch-rebaser agent via /lt-dev:git:rebase or /lt-dev:git:rebase-mrs.

When This Skill Activates

• Rebasing feature branches onto dev/develop
• Resolving merge conflicts during rebase
• Batch-rebasing multiple MRs/PRs
• Updating a branch to include latest dev changes
• Planning rebase strategies for multiple branches

Skill Boundaries

Related Skills

Rebase Strategy

Single Branch Workflow

1. Fetch latest from remote
2. Rebase onto target branch (default: dev)
3. Resolve conflicts using project context and Linear ticket info
4. Optimize code based on new dev state (remove redundancies)
5. Lint & format with oxfmt/oxlint
6. Run tests to verify nothing broke
7. Review changes for quality

Batch Workflow (MRs/PRs)

Same as single branch, plus:

• List open MRs/PRs from GitHub (gh) or GitLab (glab)
• User selects which branches to rebase
• After each branch: commit changes + force push with lease
• Generate summary report across all branches

Base Branch Detection

# Detect base branch
git branch -r | grep -E 'origin/(dev|develop)$' | head -1 | sed 's|origin/||;s/^[[:space:]]*//'

Linear Ticket Extraction

Branch names often contain Linear ticket IDs. Extract and load ticket context for better conflict resolution and code optimization.

Extraction Patterns

# Extract ticket ID from branch name
git branch --show-current | grep -oE '[A-Z]+-[0-9]+'

Using Ticket Context

Once extracted, load via mcp__plugin_lt-dev_linear__get_issue:

• Title & description: Understand the feature intent
• Acceptance criteria: Verify rebase didn't break requirements
• Comments: Additional context for conflict resolution

Conflict Resolution Strategy

Priority Order

1. Incoming changes (dev) for infrastructure/config files
2. Feature changes (current branch) for feature-specific code
3. Linear ticket context to decide ambiguous conflicts
4. Both changes when they affect different concerns

Common Conflict Patterns

After Conflict Resolution

# Continue rebase after resolving conflicts
git add .
git rebase --continue

# If rebase becomes unrecoverable
git rebase --abort

Post-Rebase Optimization

After successful rebase, check if new dev code makes parts of the feature branch redundant:

1. Duplicate implementations: Feature branch added something that dev now provides
2. Outdated workarounds: Feature branch worked around a bug that dev fixed
3. API changes: Feature branch uses old patterns that dev updated
4. Dependency conflicts: Feature branch pins a version that dev updated

Lint & Format Tools

oxfmt (Formatter)

# Format all files in a project
pnpm dlx oxfmt .

# Format specific files
pnpm dlx oxfmt src/path/to/file.ts

oxlint (Linter)

# Lint all files
pnpm dlx oxlint .

# Lint with auto-fix
pnpm dlx oxlint --fix .

Force Push Safety

Always use --force-with-lease instead of --force:

git push --force-with-lease

This prevents overwriting changes that someone else pushed to the same branch after your last fetch.

When to Use Commands

Converted and distributed by TomeVault — claim your Tome and manage your conversions.