shoko/kugetsu
1
0
Fork 0
Code Issues 17 Pull Requests Actions Packages Projects Releases 3 Wiki Activity

fix: add PR merge conflict check to dev agent workflow #233

Merged
shoko merged 2 commits from fix/issue-229-pr-conflict-check into main 2026-04-08 04:56:02 +02:00
Conversation 2 Commits 2 Files Changed 1 +23 -35

2 Commits

Author SHA1 Message Date
shokollm
c9bdc0dd88 refactor: unify duplicated prompt sections using conditional variables 
- Extract conflict_check and delegator_section as conditional variables
- Single heredoc instead of duplicate blocks
- Resolve code duplication raised in PR comment
 2026-04-08 02:35:30 +00:00
shokollm
663e44a82a fix: add PR merge conflict check and review reading to dev agent workflow 
Dev agent should:
1. Check if PR has merge conflicts before asking for review
2. Read review comments and incorporate feedback
3. Understand review states: APPROVED = ready to merge, COMMENT = feedback to address

This prevents approving a PR that has conflicts, and ensures dev agents
respond to reviewer comments appropriately.
 2026-04-08 02:27:42 +00:00