git_pre_release_skill_skill

Overview

This skill helps publish or sync a feature branch to the pre (pre-release) environment and resolve complex Git conflicts that arise in that flow. It guides interactive decision-making, preserves unrelated work, and produces clear, auditable steps. Use it when you need a safe, repeatable process to move changes into the pre branch or to recover from merge conflicts during release merges.

How this skill works

I confirm the main branch and feature branch names, then follow the repo's release/sync flow. I inspect local and remote refs, run targeted fetches, and attempt merges or rebases per the flow document. If conflicts occur, I enumerate conflict files, propose resolution choices (ours/theirs/manual), and record stash/unstash actions and final status before any push.

When to use it

• When asked to "publish to pre", "sync branch to pre", or "rebuild pre"
• When merging a long-lived feature branch into pre and conflicts are non-trivial
• When automated CI for pre is failing due to merge conflicts
• When you need a documented, reversible conflict resolution plan before pushing changes

Best practices

• Confirm <main_branch> and <feature_branch> explicitly before any destructive actions
• Do not delete or force-push branches without explicit user approval
• Avoid broad commands like git add .; stage only intended files during conflict resolution
• Create a stash or backup branch before attempting risky merges or interactive rebases
• Report all stash actions, conflicted files, and the chosen resolution strategy for auditing

Example use cases

• Syncing feature/foo into pre to run integration tests before a release
• Resolving a three-way conflict where generated files differ between pre and the feature branch
• Recovering a partially merged working tree and producing a safe push plan
• Coordinating a manual merge where multiple developers expect specific conflict outcomes