Merge Criteria
Apply this checklist to determine merge readiness:| Criteria | Requirement |
|---|---|
| Critical gaps | Zero |
| Major gaps | 3 or fewer (or refinement complete) |
| Project guide completion | 80% or higher |
| Build status | Passing |
| Tests | Passing (if applicable) |
- Critical - Security vulnerabilities, broken core functionality, data loss risks, architectural violations
- Major - Missing error handling, incomplete features, performance issues, inadequate testing
- Minor - Code style inconsistencies, documentation improvements, minor optimizations
Decision Matrix
| Condition | Decision |
|---|---|
| Zero critical gaps, minor gaps only | MERGE |
| Major gaps 3 or fewer, no critical gaps | REFINE |
| Critical gaps >0 OR fundamental issues | CLOSE |
Review Process
Verify project guide completion
Check that the PR addresses requirements from your project guide:
- Compare PR file changes against project guide requirements
- Calculate completion:
(completed items / total items) x 100 - Verify 80% or higher completion threshold
- Document any incomplete requirements
Review PR documentation
Verify the PR includes:
- Clear description of changes
- Solution approach
- Testing performed
- Known limitations or follow-up work
- Meaningful commit messages
Test locally
Validate the code in your local environment:Verify build and tests pass without critical errors.
Assess code quality
Review generated code for:
- Adherence to your codebase patterns
- Proper error handling
- Code style consistency
- Integration with existing code
- Performance considerations
Merge Conflicts
Select Fix Merge Conflicts from the Blitzy PR dropdown menu to resolve conflicts automatically. Blitzy rebases your branch and regenerates any conflicting sections while preserving the original intent.After Merging
Blitzy’s context updates to include the merged changes. Start your next feature request, bug fix, or backlog item immediately.Projects with Submodules
Clicking Merge PR merges the parent repository only. Submodule changes are not merged automatically - merge each submodule separately in your source control tool. The correct merge order for multi-repo projects:Complete all Refine PR cycles
Finish all refinement rounds on the main repository PR. Each Refine PR job reads from submodule branches - closing them prematurely causes build failures or silent regressions.
Merge submodule PRs
After the main PR is merged, merge each submodule PR in your source control tool. Then update the submodule pointers in the parent repo (see Keeping Submodules Updated).
Git Submodules
Configure and manage multi-repository projects
Project Guide Review
Verify completion before merging
Refine PR
Request targeted modifications before merging
Close Pull Request
When to discard and restart