rebase

Included with Lifetime

$97 forever

Rebase branch with intelligent conflict resolution and force push

General

What this skill does


Rebase current branch onto base branch with smart conflict resolution.

## Use Case

- PR has conflicts with main/master
- Need to update feature branch with latest changes
- Clean up branch history before merge

## Process

1. **Safety check**: Prevent running on protected branches (main, master, develop)
2. **Detect base branch**: Usually `main` or `master`
3. **Fetch and rebase**:
   ```bash
   git fetch origin <base>
   git rebase origin/<base>
   ```
4. **Handle conflicts automatically**

## Conflict Resolution Strategy

### Lockfile Conflicts (Auto-resolve)

Lockfile conflicts are resolved by reinstalling:

1. Accept incoming version: `git checkout --theirs <lockfile>`
2. Reinstall based on package manager:
   - `package-lock.json` → `npm install`
   - `yarn.lock` → `yarn install`
   - `pnpm-lock.yaml` → `pnpm install`
3. Stage and continue: `git add <lockfile> && git rebase --continue`

### Code Conflicts (Smart merge)

**Auto-resolve cases:**
- Both sides add imports → keep all imports
- Both sides add functions/variables → keep both
- Duplicate lines → remove duplicates

**Ask user cases:**
- Same line modified differently
- Logic conflicts
- Ambiguous merges

### Resolution Flow

```
Conflict detected
├─ Lockfile only → auto reinstall → continue
├─ Code (simple) → Claude merges both sides → continue
├─ Code (complex) → show conflict, ask user
└─ Mixed → resolve lockfile first, then code
```

## Safety Features

- **Protected branches**: Never rebase main/master/develop
- **force-with-lease**: Safer than `--force`
- **Smart conflict detection**: Categorize before attempting resolution

## Execution Steps

1. Check current branch is not protected
2. Run `git fetch origin` to get latest
3. Detect base branch (main or master)
4. Run `git rebase origin/<base>`
5. If conflicts:
   - Identify conflict type (lockfile vs code)
   - Apply appropriate resolution strategy
   - Continue rebase with `git rebase --continue`
   - Repeat until complete
6. Push with `git push --force-with-lease`

## Examples

**Clean rebase:**
```
/stylish-git:rebase
→ Current branch: feature/add-button
→ Fetching origin/main...
→ Rebasing onto origin/main...
→ No conflicts ✅
→ Pushing with --force-with-lease...
→ Done ✅
```

**Lockfile conflict:**
```
/stylish-git:rebase
→ Rebasing onto origin/main...
→ Conflict: package-lock.json (lockfile)
→ Auto-resolving: npm install...
→ Continuing rebase...
→ Done ✅
```

**Code conflict (auto-resolved):**
```
/stylish-git:rebase
→ Conflict: src/utils.ts
→ Analyzing... both sides add different imports
→ Merging: keeping all imports
→ Continuing rebase...
→ Done ✅
```

**Code conflict (needs input):**
```
/stylish-git:rebase
→ Conflict: src/api.ts
→ Same function modified differently on both sides
→ Showing both versions...
→ Which version to keep? (ours/theirs/manual)
```

**Protected branch error:**
```
/stylish-git:rebase
→ Error: Cannot rebase on protected branch 'main'
→ Switch to a feature branch first
```

Files: 1

Size: 3.1 KB

Complexity: 10/100

Category: General

Source: https://github.com/stylelist94/claude-plugins/tree/main/plugins/stylish-git/skills/rebase

Related in General

modeling-omnistudio-epc-catalog

Included

Salesforce Industries CME EPC product-modeling skill for Product2-based catalog creation. Use when creating EPC products, configuring product attributes, building offer bundles with Product Child Items, or reviewing EPC DataPack JSON metadata for product catalog changes. TRIGGER when: user creates or updates Product2 EPC records, AttributeAssignment payloads, AttributeMetadata/AttributeDefaultValues, Offer bundles, or ProductChildItem relationships. DO NOT TRIGGER when: designing OmniScripts/FlexCards/Integration Procedures (use building-omnistudio-omniscript, building-omnistudio-flexcard, or building-omnistudio-integration-procedure), implementing Apex business logic (use generating-apex), or troubleshooting deployment pipelines (use deploying-metadata).

Generalscripts

relationship-science-coach

Included

Use this skill for direct, practical adult relationship coaching: couples conflict, repair, trust, marriage, dating, flirting, attachment patterns, emotional connection, sex, desire differences, eroticism, kink negotiation, affection, love languages, breakups, and long-term passion. Draw on Gottman, EFT and Hold Me Tight, attachment science, modern sex research, Perel, Nagoski, Kerner, Schnarch, Love and Stosny, and flexible love-language tools. Be concrete and low-hedge. Redirect only for imminent danger, abuse, coercive control, minors, non-consent, self-harm, stalking, or medical/legal/psychiatric decisions.

Generalscripts

building-sf-integrations

Included

Salesforce integration architecture and runtime plumbing with 120-point scoring. Use this skill to set up Named Credentials, External Credentials, External Services, REST/SOAP callout patterns, Platform Events, and Change Data Capture. TRIGGER when: user sets up Named Credentials, External Services, REST/SOAP callouts, Platform Events, CDC, or touches .namedCredential-meta.xml files. DO NOT TRIGGER when: Connected App/OAuth config (use configuring-connected-apps), Apex-only logic (use generating-apex), or data import/export (use handling-sf-data).

Generalscripts

venue-templates

Included

Access comprehensive LaTeX templates, formatting requirements, and submission guidelines for major scientific publication venues (Nature, Science, PLOS, IEEE, ACM), academic conferences (NeurIPS, ICML, CVPR, CHI), research posters, and grant proposals (NSF, NIH, DOE, DARPA). This skill should be used when preparing manuscripts for journal submission, conference papers, research posters, or grant proposals and need venue-specific formatting requirements and templates.

Generalscripts

let-fate-decide

Included

Draws the 12 Houses of the Zodiac Tarot spread to inject entropy into planning when prompts are vague, ambiguous, or casually delegated. Interprets the spread to guide next steps. Use when the user says 'let fate decide', 'YOLO', 'whatever', 'idk', or other nonchalant phrases, makes Yu-Gi-Oh references, or when you are about to arbitrarily pick between multiple reasonable approaches. Prefer over ask-questions-if-underspecified when the user's tone is casual or playful rather than precision-seeking.

Generalscripts

net-ops

Included

Cross-platform network troubleshooting (Windows, macOS, Linux) via local or remote shell. Use for: DNS broken, can't resolve hostnames, nslookup/dig works but apps fail, NRPT, WFP, scutil, /etc/resolver, systemd-resolved, /etc/resolv.conf, NetworkManager, VPN DNS leak residue (ProtonVPN/Mullvad/WireGuard/AnyConnect), AV/firewall blocking DNS or DoH, Tailscale DNS interaction, intermittent connectivity, remote diagnostics over SSH.

Generalscripts