Git Merge Planner
Independent PiSkill directory guide. The original prompt remains hosted by Microsoft HVE Core.
What does this prompt do?
Plans and performs a Git merge by inspecting branches, commits, conflicts, repository guidance, tests, and rollback options before finalizing history.
Primary use case
Merge a branch safely with explicit conflict and validation handling.
Expected output
A validated merge or a precise conflict and blocker report.
Inputs or variables
- source branch
- target branch
- repository constraints
Related prompts
Git Commit Message
Inspects repository changes and drafts a concise commit message grounded in the actual diff.
Pull Request Draft
Creates a pull-request summary from the current branch while preserving links, validation evidence and reviewer context.
Claude Commit Workflow
Creates a focused Git commit from the current changes after inspecting repository state, understanding intent, and preparing an accurate commit message.
Pull Request Visualization
Turns pull-request information into a visual summary through a reusable Copilot SDK recipe.
Accessibility Coverage Matrix
Builds an evidence-based accessibility test matrix that maps requirements, assistive technologies and validation coverage.
Azure DevOps Build Investigation
Collects Azure DevOps build information and organizes status, stages, failures, logs, and relevant repository context for efficient diagnosis.