Skip to content

Use vigilante logs in the conflict-resolution workflow#287

Merged
nicobistolfi merged 1 commit intomainfrom
vigilante/issue-283-use-vigilante-logs-in-the-conflict-resolution-workflow
Mar 24, 2026
Merged

Use vigilante logs in the conflict-resolution workflow#287
nicobistolfi merged 1 commit intomainfrom
vigilante/issue-283-use-vigilante-logs-in-the-conflict-resolution-workflow

Conversation

@nicobistolfi
Copy link
Copy Markdown
Collaborator

Summary

  • add vigilante logs --repo <owner/name> --issue <n> triage guidance to the conflict-resolution skill for failed rebases, failed validation, and unclear session state
  • align the generated conflict-resolution prompt with the same log-inspection step
  • cover the prompt text in the existing conflict-resolution prompt test

Validation

  • go test ./internal/skill

Closes #283

@nicobistolfi nicobistolfi force-pushed the vigilante/issue-283-use-vigilante-logs-in-the-conflict-resolution-workflow branch from 5334e67 to 99c10ce Compare March 24, 2026 23:12
@nicobistolfi nicobistolfi merged commit d4dd02b into main Mar 24, 2026
1 check passed
@nicobistolfi nicobistolfi deleted the vigilante/issue-283-use-vigilante-logs-in-the-conflict-resolution-workflow branch March 24, 2026 23:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Use vigilante logs in the conflict-resolution workflow

1 participant