merge

Execute a structured UAT workflow to validate feature-branch changes before merging into dev.

1|Updated Aug 21, 2025

Search Tags:#git #workflow #qa #merge #branch #dev #uat

Ready to run

npx skills add https://github.com/camronh/EZVals --skill merge-camronh

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: merge
Source: https://github.com/camronh/EZVals/tree/main/.agents/skills/merge
Command: npx skills add https://github.com/camronh/EZVals --skill merge-camronh

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

UAT on a feature branch ensures changes are validated prior to merging into dev, reducing risk of regressions and mismatch between feature work and dev baseline.

Core Features & Use Cases

UAT preparation on a feature branch including verification that the branch has been updated with dev.
Guidance on handling worktrees, rebasing, and diff analysis to understand impact before merge.
Use case: When a feature is ready for integration, run the UAT workflow to confirm changes align with dev expectations.

Quick Start

Inspect the feature branch, ensure tests pass, and perform the UAT merge steps as described.

Frequently Asked Questions about merge

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

FAQPage Schema

How do I run UAT on a git feature branch before merging into dev?▼

Run UAT on a feature branch by executing a structured workflow that verifies changes, cleans up worktrees, rebases onto dev, and performs diff analysis before integration. This ensures feature work aligns with the dev baseline and reduces regression risk.

Why should I rebase a feature branch onto dev before UAT validation?▼

Rebasing a feature branch onto dev before UAT validation ensures the feature includes the latest baseline changes. This prevents mismatches between feature work and dev, reducing integration conflicts and regressions during the final merge.

What is the best way to validate feature-branch changes before a dev merge?▼

The best way to validate feature-branch changes is a structured UAT workflow covering worktree cleanup, rebasing, and diff analysis. This process confirms the code is ready for integration and matches dev expectations before merging.

Can I use this UAT workflow for git branches that haven't been updated with dev?▼

No, this UAT workflow applies only to ready-to-merge code where the branch has been updated with dev. It explicitly requires rebasing onto dev and diff analysis to ensure worktree consistency before integration.

What steps are included in a pre-merge UAT workflow for feature branches?▼

A pre-merge UAT workflow includes explicit steps for worktree cleanup, rebasing onto the dev branch, diff analysis to understand impact, and final guidance for successful UAT merging. These steps ensure changes are fully validated before integration.

When do I need to perform worktree cleanup during a git branch UAT?▼

Worktree cleanup is needed during UAT when preparing a feature branch for integration into dev. It ensures worktree consistency before rebasing and diff analysis, preventing local state issues from affecting the final UAT merge validation.