34 lines
1.3 KiB
Markdown
34 lines
1.3 KiB
Markdown
# PR#89: The Plan Holds the Conflict of a WIP Pull Request
|
|
|
|
Version: patch
|
|
|
|
> **WARNING:** This document describes only the change applied in this PR.
|
|
> It may already be outdated once the next PR is merged.
|
|
> Historic PR documentation is not maintained along with new PRs; treat it as a snapshot.
|
|
|
|
## Related Links
|
|
|
|
- [werkregie PR#43](https://git.javagil.de/mi/werkregie/pulls/43), which shows conflicts that the agent leaves, but not those of drafts.
|
|
- [werkregie PR#65](https://git.javagil.de/mi/werkregie/pulls/65), a WIP pull request in conflict without a commit since 2026-10-14.
|
|
|
|
## Problem
|
|
|
|
"Du bist dran" did not show werkregie PR#65, a WIP pull request in conflict whose author session had moved on.
|
|
Werkregie PR#43 left drafts out, since Gitea's API gives `mergeable` false for each WIP pull request.
|
|
The web pages of Gitea show the conflict, but its API does not.
|
|
|
|
## Non-Goals
|
|
|
|
- No code; the plan only.
|
|
The code follows once no other pull request of werkregie is open.
|
|
|
|
## Solution
|
|
|
|
- `doc/werkregie.werkbaum`: the node `#orch.wipConflict`, decided by the user on 2026-10-15:
|
|
the server finds the conflict of a WIP pull request with `git merge-tree` and shows it after 30 min without a new commit.
|
|
- The step of `#sat.t3` for Gitea says what it checks about the title of a new pull request.
|
|
|
|
## Open Questions
|
|
|
|
None.
|