rebase-assistant

Included with Lifetime

$97 forever

Guide a safe git rebase of the current branch onto a target branch, including conflict triage and resolution steps. Use when asked to rebase, update a branch, or resolve rebase conflicts.

General

What this skill does

# Rebase assistant

## Goal
Rebase the current branch onto a target branch safely, with built-in conflict resolution guidance.

## Inputs to confirm (ask if missing)
- Target branch (explicit branch name or "default branch").
- Preferred conflict bias when ambiguous: keep ours, keep theirs, or manual merge.
- Protected paths or file types to avoid touching.

## Workflow
1) Identify the target branch
   - If user says "default branch": discover via `git remote show origin` (read "HEAD branch").
   - If ambiguous or no remote: ask the user which branch to use.
2) Preflight checks
   - `git status -sb` (must be clean before rebase).
   - `git fetch --prune` to sync remotes.
   - Optional safety branch (ask before creating): `git branch backup/<current-branch>`.
3) Start the rebase
   - `git rebase <target-branch>`
4) If conflicts occur, resolve (repeat per file)
   - Inspect conflict list:
     - `git status -sb`
     - `git diff --name-only --diff-filter=U`
   - Classify and inspect:
     - Content conflicts: open file, resolve markers.
     - Delete/modify or rename conflicts: decide keep vs delete explicitly.
     - Binary conflicts: choose ours/theirs only.
   - Show base/ours/theirs when useful:
     - `git show :1:<path>`
     - `git show :2:<path>`
     - `git show :3:<path>`
   - File-level choice when safe:
     - `git checkout --ours <path>`
     - `git checkout --theirs <path>`
   - Stage resolved files: `git add <path>`
   - Continue: `git rebase --continue`
5) Finish and verify
   - Ensure no conflicts: `git status -sb`
   - Suggest a fast test/build if available.

## Safety rules
- Never run `git reset --hard`, `git clean -fd`, or `git rebase --abort` unless the user explicitly requests it.
- Always show candidate commands before applying destructive changes.

## Deliverables
- The exact rebase command used and target branch.
- Conflict list grouped by type with per-file resolution guidance.
- Completion command and a short verification suggestion.

Files: 1

Size: 2.2 KB

Complexity: 6/100

Category: General

Source: https://github.com/jmerta/codex-skills/tree/main/rebase-assistant

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