docs: Document merge conflict check in SDLC [doc-updater] - #346
Conversation
Update SDLC pipeline guide to reflect merge conflict detection added in PR #339. The PR finalization step now checks for merge conflicts with the base branch before marking the PR as ready for review. If conflicts are detected, the PR remains as draft and the pipeline pauses until the conflicts are resolved. Triggered by: https://github.com/anthropics/egg/pull/339 Authored-by: egg
![james-in-a-box[bot]](https://avatars.githubusercontent.com/u/8340608?s=60&v=4){kind=small}
There was a problem hiding this comment.
No agent-mode design concerns.
This is a documentation-only change that documents the merge conflict detection step in the SDLC pipeline. The conflict check is appropriately implemented at the infrastructure level (pipeline), not via prompt-level constraints—which aligns well with the "sandbox is the constraint" principle.
— Authored by egg
This comment has been minimized.
This comment has been minimized.
|
egg agent-mode-design completed. View run logs |
There was a problem hiding this comment.
Documentation Review
This PR documents the merge conflict detection feature from PR #339. The change is straightforward and mostly accurate.
Minor Issue
Line 171: The wording "the pipeline pauses until conflicts are resolved" is slightly misleading.
Looking at the implementation in .github/workflows/sdlc-pipeline.yml:736-740, when conflicts are detected:
The PR remains as a draft. Resolve the conflicts and re-run the pipeline.
The pipeline doesn't actually "pause" waiting for resolution—it completes (with the PR staying as draft) and requires manual re-triggering after conflicts are resolved. Consider rewording to:
6. **Merge conflict check** — Before finalization, the pipeline checks if the PR has conflicts with the base branch. If conflicts exist, the PR remains as draft and the pipeline exits; conflicts must be resolved and the pipeline re-runThis is a minor accuracy issue and doesn't block approval. The core information (that merge conflicts are checked before finalization) is correct.
Verified
- Cross-referenced with PR #339 description and the actual workflow implementation
- The numbered steps correctly update step 6 → step 7
— Authored by egg
|
egg review completed. View run logs |
This comment has been minimized.
This comment has been minimized.
Fixes misleading wording that implied the pipeline "pauses" waiting for conflict resolution. The pipeline actually exits and must be manually re-triggered after conflicts are resolved. Authored-by: egg
This comment has been minimized.
This comment has been minimized.
There was a problem hiding this comment.
Agent-mode design re-review: No concerns.
The new commit (f57586d) addresses the feedback from my previous review. The wording now accurately states that the pipeline "exits" when conflicts are detected and must be "re-run," rather than implying it "pauses" waiting for resolution.
This remains a documentation-only change with no agent-mode design implications. Approved from an agent-mode design perspective.
— Authored by egg
There was a problem hiding this comment.
Re-Review: Changes Since e1429ac
Previous Feedback Addressed ✓
My previous review raised one issue: the wording "the pipeline pauses until conflicts are resolved" was misleading since the pipeline actually exits and requires manual re-triggering.
The updated text correctly addresses this:
6. **Merge conflict check** — Before finalization, the pipeline checks if the PR has conflicts with the base branch. If conflicts exist, the PR remains as draft and the pipeline exits; conflicts must be resolved and the pipeline re-runThis accurately reflects the workflow behavior at .github/workflows/sdlc-pipeline.yml:736-740 where conflicts cause the pipeline to exit (not pause), and the PR remains as draft until conflicts are resolved and the pipeline is re-run.
Changes Verified
- Cross-referenced with the actual workflow implementation
- Step numbering correctly updated (6 → merge conflict check, 7 → PR finalization)
- Step 7 correctly adds "and no merge conflicts exist" to the finalization conditions
No issues found in the updated changes.
— Authored by egg
|
egg agent-mode-design completed. View run logs |
This comment has been minimized.
This comment has been minimized.
|
egg review completed. View run logs |
| egg is addressing review feedback... |
|
egg feedback addressed. View run logs |
1 participant
Update the SDLC Pipeline guide to document the merge conflict detection feature added in PR #339.
The PR finalization step now includes a merge conflict check that runs before marking the draft PR as ready for review. If conflicts with the base branch are detected, the PR remains as draft and the pipeline pauses until conflicts are resolved.
Changes:
Triggered by: https://github.com/anthropics/egg/pull/339
Authored-by: egg