readme-conflict-cleanup: README conflict cleanup #3
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "task/readme-conflict-cleanup"
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?
Assigned idea
Benchmark authoring specification.
Summary: Repair the visible merge-conflict damage in README.md while preserving the portfolio feature list and the documented React + TypeScript technology stack.
Task intent: Perform ordinary upstream-facing documentation maintenance: resolve the unresolved merge conflict in README.md's Features section and leave a polished, consistent project overview for the Vite + React + TypeScript portfolio site.
Benchmark plan: Construct the task package from commit fec749003c8ea341e881c3feb6c7f8885be7bb0e with README.md containing the conflict markers shown in the provided evidence. The solver prompt should ask only for a documentation cleanup in README.md: remove conflict markers, merge the two competing Features lists into one coherent Markdown list, keep the React + TypeScript technology-stack statement, and avoid changing application source files. The package should include a Python verifier test_outputs.py that inspects the final README.md text deterministically.
Environment plan: The repo environment is the materialized mwakidenis/portfolio_website checkout at the fixed commit. The task environment only needs Python 3 for verifier execution; no npm install or browser build is required because the intended change is README-only documentation repair. If iterate chooses to expose repo scripts, they should be optional and not required for grading.
Verifier plan: test_outputs.py should read README.md and assert: no Git conflict marker substrings remain, including <<<<<<<, =======, >>>>>>>, and stray <<<<<; the Features section still includes the dark/light mode toggle bullet; the responsive bullet is normalized to mention all devices and the 320px - 2xl range; the Project Portfolio subsection contains GitHub API integration, rich descriptions, live demo links, GitHub repository links, and dynamic tech stack tags; the README still mentions React and TypeScript together in the technology section. The test should fail if files outside README.md are modified, using git diff --name-only against the provided base when available.
Oracle plan: The oracle solution is a README.md-only patch that deletes the conflict markers and keeps the stronger HEAD-side wording for the Features section, while retaining useful non-conflicting bullets from both sides. It should preserve the existing introductory text and technology list, including the React + TypeScript line, and produce valid Markdown bullets without duplicated or emoji-spam variants.
Difficulty plan: Current coding agents may over-correct by rewriting the whole README, deleting project-specific feature bullets, or choosing only one side of the conflict and losing details such as GitHub API integration or the responsive 320px - 2xl range. Some may also edit unrelated source files or run unnecessary framework migrations despite the work being a deterministic documentation repair.
Repo patch scope: Expected upstream edits are limited to README.md, specifically the Features section and any immediately adjacent malformed conflict-marker line.
Anti-leakage notes: The solver-facing prompt must not mention benchmark, harness, Snorkel, Harbor, std-ts, agent, stage, attempt, retry, generated task, or evaluation context. Present it as a normal documentation cleanup request for the portfolio repository.
Approach: Ask the solver to inspect README.md, resolve the conflict by producing one clean Features list, preserve the documented Vite + React + TypeScript identity, and avoid unrelated changes.
Verification: Run python test_outputs.py from the repository root; it should validate README.md content and confirm no non-README.md files changed.
Risk: Because the evidence is README-only, the work should remain scoped to documentation. The main risk is making assertions too stylistic; the verifier should check concrete retained phrases and absence of conflict markers rather than exact full-file text.
Path rules: task package is tasks/; mutable upstream checkout is tasks//environment/repo; benchmark package files are under tasks//task; verifier/container environment belongs under tasks//task/environment; regular and UI verifier logic belongs in task/tests/test_outputs.py and test.sh only runs that file through pytest.
Agent context
Task slug: readme-conflict-cleanup
Branch: task/readme-conflict-cleanup
View command line instructions
Checkout
From your project repository, check out a new branch and test the changes.Merge
Merge the changes and update on Forgejo.Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.