skills.rest
yournextstore
yournextstoreOFFICIAL
Explore all skills by this author →
Website𝕏@yournextstoreGitHub

rebase-themes

Rebase theme-* branches onto main with conflict resolution and post-rebase checks.

5.5k|665|Updated Aug 5, 2024
Search Tags:#automation#git#workflow#devops#themes#rebase#conflicts
One-click install
npx skills add https://github.com/yournextstore/yournextstore --skill rebase-themes
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: rebase-themes
Source: https://github.com/yournextstore/yournextstore/tree/main/.agents/skills/rebase-themes
Command: npx skills add https://github.com/yournextstore/yournextstore --skill rebase-themes

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Rebase all theme-* branches onto main, resolving conflicts while preserving each theme's visual identity. Force-pushes directly to theme branches with backup tags. Run as a scheduled task or one-off.

Core Features & Use Cases

  • Automated multi-branch rebase: Rebases all theme branches onto the latest main to pick up infrastructure, SDK, and bug fixes without altering each theme's appearance.
  • Conflict handling and backups: Creates backup tags per theme branch and resolves conflicts with the theme's visuals prioritized.
  • Post-rebase validation: Runs environment checks (bun install, biome) and communicates a per-theme status summary, then updates branches.

Quick Start

Execute the rebase workflow for all theme branches to align them with main.

Frequently Asked Questions about rebase-themes

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I rebase multiple theme branches onto main without causing visual conflicts?▼

Automated multi-branch rebasing rebases all theme branches onto main while resolving conflicts to preserve each theme's visual identity. It applies guarded conflict resolution rules that prioritize the theme's appearance during the rebase process.

What happens if a rebase fails during the theme branch update?▼

When a rebase fails, the workflow executes explicit failure handling steps and utilizes backup tags created per theme branch prior to the operation. This ensures you can recover the original branch state if post-rebase validation encounters issues.

Can I run this git rebase workflow as a scheduled DevOps task?▼

Yes, you can run this rebase workflow as a scheduled task or a one-off operation to align theme branches. It automates environment checks using bun install and biome to validate branch stability after rebasing.

Does rebasing theme branches permanently overwrite previous git history?▼

The workflow force-pushes directly to theme branches but first creates backup tags per theme branch. This safeguards previous states while applying infrastructure and bug fixes from main to update the branches.

How does automated conflict resolution work when updating theme branches?▼

Automated conflict resolution applies guarded rules that prioritize the theme's visual identity during the rebase. Post-rebase checks then run bun install and biome to verify environment integrity and communicate a per-theme status summary.

Related Skills

Explore More Software Engineering Skills→
cloud-native-toolscloud-native-tools

git-workflow

Reconcile MAIN, PRE, and DEV branches with rebase-based synchronization and .gitexcludes protection.

Official
Advanced
AbildtoftAbildtoft
2

kramme:rebase-pr

Rebase the current branch onto the latest base branch and force-push with --force-with-lease.

Community
Advanced
4lerman4lerman

senior-devops

Automates DevOps workflows including CI/CD pipelines, infrastructure as code, and container deployments with rollback support.

Community
Advanced
tomholfordtomholford
6

rebase

Rebase the current branch onto a target branch and summarize conflict resolutions.

Community
Advanced