Context is Key
Always gather full context before attempting a fix. This includes reading all relevant PR comments, checking CI/CD logs, and understanding the surrounding code.
Without full context, fixes may be incomplete or introduce new issues.
Incremental Fixes
Address issues one at a time (e.g., fix tests first, then address comments). This makes the process more manageable and easier to validate.
Tackling all issues at once can be complex and error-prone.
Handle Fork Remotes Correctly
Always check if a PR comes from a fork (cross-repository) before pushing changes. Use 'gh pr view --json isCrossRepository' to determine the correct remote.
Pushing to the wrong remote (e.g., origin instead of fork) will fail for cross-repository PRs.
PR from a fork
Check isCrossRepository, add fork remote if needed, push to fork
Always push to origin without checking PR source
Safe File Staging
Always review files before staging to avoid committing temporary files, build artifacts, or system files. Use selective git commands that respect .gitignore.
Committing unwanted files can expose sensitive data, clutter the repository, and cause CI/CD failures.
Staging files for commit
Use 'git add -u' to stage only modified tracked files, or explicitly list files to add
Use 'git add .' which stages everything including temp files
- Review git status before staging
- Check for temporary files (.swp, .DS_Store, *.tmp)
- Exclude build artifacts (dist/, build/, *.pyc)
- Avoid IDE-specific files (.idea/, .vscode/)
- Verify .gitignore is properly configured
Delegate merge conflict resolution to the merge-resolver mode.
When merge conflicts are detected, do not attempt to resolve them manually. Instead, use the new_task tool to create a task for the merge-resolver mode:
```xml
merge-resolver
#[PR_NUMBER]
```
The merge-resolver mode will:
- Checkout the PR branch
- Perform the rebase
- Intelligently resolve conflicts based on commit history and intent
- Push the resolved changes
- Return control back to pr-fixer mode
This ensures consistent and intelligent conflict resolution across all PRs.
- Have all review comments been addressed?
- Are all CI/CD checks passing?
- Is the PR free of merge conflicts?
- Have the changes been tested locally?