gps-denied-desktop/_ai/commands/5.iterative/5.30_gen_merge_and_deploy.md

Merge and Deploy Feature

Complete the feature development cycle by creating PR, merging, and updating documentation.

Input parameters

• task_id (required): Jira task ID Example: /gen_merge_and_deploy AZ-122

Prerequisites

• All tests pass locally
• Code review completed (or ready for review)
• Definition of Done checklist reviewed

Steps (Agent)

1. Verify Branch Status

git status
git log --oneline -5

• Confirm on feature branch (e.g., az-122-feature-name)
• Confirm all changes committed
• If uncommitted changes exist, prompt user to commit first

2. Run Pre-merge Checks

User action required: Run your project's test and lint commands before proceeding.

# Check for merge conflicts
git fetch origin dev
git merge origin/dev --no-commit --no-ff || git merge --abort

• All tests pass (run project-specific test command)
• No linting errors (run project-specific lint command)
• No merge conflicts (or resolve them)

3. Update Documentation

CHANGELOG.md

Add entry under "Unreleased" section:

### Added/Changed/Fixed
- [TASK_ID] Brief description of change

Update Jira

• Add comment with summary of implementation
• Link any related PRs or documentation

4. Create Pull Request

PR Title Format

[TASK_ID] Brief description

PR Body (from template)

## Description
[Summary of changes]

## Related Issue
Jira ticket: [TASK_ID](link)

## Type of Change
- [ ] Bug fix
- [ ] New feature
- [ ] Refactoring

## Checklist
- [ ] Code follows project conventions
- [ ] Self-review completed
- [ ] Tests added/updated
- [ ] All tests pass
- [ ] Documentation updated

## Breaking Changes
[None / List breaking changes]

## Deployment Notes
[None / Special deployment considerations]

## Rollback Plan
[Steps to rollback if issues arise]

## Testing
[How to test these changes]

5. Post-merge Actions

After PR is approved and merged:

# Switch to dev branch
git checkout dev
git pull origin dev

# Delete feature branch
git branch -d {feature_branch}
git push origin --delete {feature_branch}

6. Update Jira Status

• Move ticket to "Done"
• Add link to merged PR
• Log time spent (if tracked)

Guardrails

• Do NOT merge if tests fail
• Do NOT merge if there are unresolved review comments
• Do NOT delete branch before merge is confirmed
• Always update CHANGELOG before creating PR

Output

• PR created/URL provided
• CHANGELOG updated
• Jira ticket updated
• Feature branch cleaned up (post-merge)