git-rebase-main
Git Rebase Main
Purpose
Ensure the current feature branch includes all the latest changes from main before proceeding with code review, UAT, or release. This prevents merge conflicts and ensures tests run against the latest codebase.
Hard Rules
Must
- Fetch from origin before rebasing.
- Handle rebase conflicts by stopping and reporting to the user.
- Verify the branch is not
mainbefore rebasing.
Must Not
- Force-push without user confirmation.
- Rebase if there are uncommitted changes.
Actions
1. Pre-flight Checks
More from oocx/tfplan2md
arc42-documentation
Create comprehensive architecture documentation using the arc42 template structure (12 sections covering introduction, constraints, context, solution strategy, building blocks, runtime, deployment, concepts, decisions, quality, risks, and glossary).
83website-quality-check
Run a lightweight, repeatable quality checklist for the website (including style guide adherence).
19analyze-chat-export
Export and analyze VS Code Copilot chat logs for retrospective metrics. Extracts model usage, tool invocations, approval patterns, and timing data.
18create-pr-azdo
Create an Azure DevOps pull request using az devops tooling; include the repo’s linear-history merge preference and ask the Maintainer if merge options differ.
17website-devtools
Use browser tools to inspect rendering and troubleshoot website issues with the Maintainer.
17agent-tool-selection
Guide for selecting appropriate VS Code Copilot tools when configuring agents, including environment-specific considerations.
17