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
shoko commented 2026-04-08 04:16:34 +02:00
Owner
Copy Link

Dev agent should check if PR has merge conflicts before asking for review. This prevents approving a PR that has conflicts.

Changes:

  • Add conflict check step in workflow for both with/without user message cases
  • Use mergeable field from PR API to detect conflicts
  • Instructions to rebase and resolve conflicts if mergeable: false
Dev agent should check if PR has merge conflicts before asking for review. This prevents approving a PR that has conflicts. Changes: - Add conflict check step in workflow for both with/without user message cases - Use mergeable field from PR API to detect conflicts - Instructions to rebase and resolve conflicts if mergeable: false
shoko added 1 commit 2026-04-08 04:16:35 +02:00
fix: add PR merge conflict check to dev agent workflow 3a0983c28a 
Dev agent should check if PR has merge conflicts before asking for review.
This prevents approving a PR that has conflicts, which could introduce
new errors after rebase.

Changes:
- Add conflict check step in workflow for both with/without user message cases
- Use mergeable field from PR API to detect conflicts
- Instructions to rebase and resolve conflicts if mergeable: false
han commented 2026-04-08 04:22:18 +02:00
First-time contributor
Copy Link

why do we have to write two exactly same lines on different lines? can't we unify the prompt to avoid code duplication? I think the only different is this about the user delegation, can't we somehow make it fillable if message is provided? and just skip it if there is no message? what do you think?

why do we have to write two exactly same lines on different lines? can't we unify the prompt to avoid code duplication? I think the only different is this about the user delegation, can't we somehow make it fillable if message is provided? and just skip it if there is no message? what do you think?
shoko force-pushed fix/issue-229-pr-conflict-check from 3a0983c28a to 663e44a82a 2026-04-08 04:28:09 +02:00 Compare
shoko added 1 commit 2026-04-08 04:35:38 +02:00
refactor: unify duplicated prompt sections using conditional variables c9bdc0dd88 
- Extract conflict_check and delegator_section as conditional variables
- Single heredoc instead of duplicate blocks
- Resolve code duplication raised in PR comment
han approved these changes 2026-04-08 04:55:12 +02:00
han left a comment
First-time contributor
Copy Link

lgtm

lgtm
shoko merged commit efb1e34a7b into main 2026-04-08 04:56:02 +02:00
Sign in to join this conversation.
Reviewers
No Reviewers
han
Labels
Clear labels
0.2.x-only
Available only in 0.2.x, not backportable
 0.3.x-only
Available only in 0.3.x, not backportable
 backport
Backport compatible - can merge to 0.1.x
 blocked
Issue needs clarification/discussion before it can be worked on
 bug
Bug report
 critical
Critical - blocking parallel work
 feature
New feature
 foundation
Foundation work for 0.2.x
 high
High priority - workflow improvements
 meta
Meta issue tracking multiple issues
 need-review
PR needs review before merge
 parallelization
Issues related to parallelization
 ready
Issue is clear and ready to be implemented/delegated
 ready-to-merge
PR approved and ready to merge
 task-delegation
Issues related to task-delegation
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
shoko
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: shoko/kugetsu#233
Delete Branch "fix/issue-229-pr-conflict-check"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?