reset-stage

Reset stage branches from main and re-merge on-stage PRs with conflict resolution.

25|15|Updated Aug 2, 2021

Search Tags:#automation #devops #pr-management #slack-notifications #git-merge #reset-stage #stage-branch

Ready to run

npx skills add https://github.com/JesusFilm/core --skill reset-stage

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: reset-stage
Source: https://github.com/JesusFilm/core/tree/main/.cursor/skills/reset-stage
Command: npx skills add https://github.com/JesusFilm/core --skill reset-stage

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

Automates the stage branch reset from main and re-merges all on-stage PRs, reducing manual conflict resolution and noise while keeping history intact.

Core Features & Use Cases

Automates stage resets from main and re-merges on-stage PRs
Resolves conflicts automatically using a deterministic merge strategy
Notifies Slack with a detailed, threaded report and audit-friendly output

Quick Start

Run the reset-stage script in dry-run mode to verify the flow before applying changes.

Frequently Asked Questions about reset-stage

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

FAQPage Schema

How do I automatically reset a stage branch from main and re-merge active pull requests?▼

To automatically reset a stage branch from main and re-merge active pull requests, this Skill automates the entire process using a deterministic merge strategy for automatic conflict resolution. It safely runs in a dry-run mode by default before applying changes.

How do I resolve stage branch conflicts automatically after resetting from main?▼

You can resolve stage branch conflicts automatically by running the reset process with an apply option, which uses a deterministic merge strategy to handle conflicts during the re-merge of all on-stage PRs while keeping your history intact.

Do I need GitHub CLI and Slack integration to automate stage branch resets?▼

Yes, you need GitHub CLI and Slack integration to automate stage branch resets. These prerequisites enable the script to manage pull requests and send a detailed, threaded audit report of the merge and conflict resolution to Slack.

What is the best way to resolve stage drift and merge conflicts without losing git history?▼

The best way to resolve stage drift and merge conflicts without losing git history is to automate the stage branch reset from main. This re-merges all on-stage PRs with automatic conflict resolution and provides an audit-friendly Slack notification.

Can I test a stage branch reset and PR re-merge before applying changes to the repository?▼

Yes, you can test a stage branch reset and PR re-merge before applying changes by running the script in its default dry-run mode. This verifies the flow and automatic conflict resolution safely before you use the apply option to commit the results.