▸case-18 When providing the final summary after fixing conflicts in api.ts, schema.prisma, and package-lock.json, what required section lists the modified paths? | pass→fail | 4,463 | 1,884 | -58% | 1 | 1 | 0% | 767 | 458 | -40% | 0 | 0 | — |
▸case-01 I just merged main into my feature branch and ran into several merge conflicts across my TypeScript files and lockfile. Please fix all the conflicts, stage the clean files, and run project checks. In your final response, provide a breakdown that lists the files resolved, details any notable resolution choices you made, and gives the build/test outcome. | fail→fail | 3,412 | 3,470 | +2% | 1 | 1 | 0% | 129 | 403 | +212% | 0 | 0 | — |
▸case-02 Our PR branch failed to integrate cleanly with upstream and has conflict markers scattered across a few backend services. Can you clear out all conflicting files, verify the repository builds properly, and stage the changes? Please output a summary showing which files were resolved, key decisions made for tricky conflict sections, and the build/test status. | fail→fail | 5,824 | 5,092 | -13% | 1 | 1 | 0% | 244 | 372 | +52% | 0 | 0 | — |
▸case-03 I hit git conflicts while updating our release candidate branch. Please process all the unresolved conflicts in the codebase and verify the project compiles and passes testing. Include a report at the end that lists all resolved files, explains major resolution choices, and reports the overall test and build outcome. | fail→fail | 3,392 | 2,709 | -20% | 1 | 1 | 0% | 157 | 320 | +104% | 0 | 0 | — |
▸case-04 We have merge conflicts in package-lock.json after merging main into our feature branch. The conflicting lines show different dependency version hashes. Should I manually delete the conflict markers in package-lock.json and keep the higher version, or how should this lockfile conflict be handled? | pass→pass | 8,322 | 4,616 | -45% | 1 | 1 | 0% | 1,617 | 1,093 | -32% | 0 | 0 | — |
▸case-05 I have finished resolving the merge conflicts in our Go microservice repository. Everything builds and passes tests locally. I am tempted to run git push origin main --tags right away so the deployment pipeline starts. Should you execute the push and tag creation now? | pass→pass | 9,927 | 5,613 | -43% | 1 | 1 | 0% | 1,731 | 1,141 | -34% | 0 | 0 | — |
▸case-06 In our Python web service, main added import logging while feature added import metrics at the exact same lines in app.py. The model default might pick incoming main's import. How should this conflict in app.py be resolved? | pass→pass | 7,923 | 4,598 | -42% | 1 | 1 | 0% | 1,477 | 1,043 | -29% | 0 | 0 | — |
▸case-07 In userService.ts, branch A changed function getUser(id: string) signature to getUser(id: string, includeMetadata = false) while branch B renamed it to fetchUserRecord(id: string). What approach should be taken when resolving this interface conflict? | pass→pass | 8,392 | 6,048 | -28% | 1 | 1 | 0% | 1,576 | 1,296 | -18% | 0 | 0 | — |
▸case-08 While resolving a conflict in auth.js, I noticed that adjacent helper functions use legacy callback syntax instead of Promises. Should we refactor those surrounding callback functions to Promises while fixing the conflict markers? | pass→pass | 9,098 | 3,633 | -60% | 1 | 1 | 0% | 1,471 | 828 | -44% | 0 | 0 | — |
▸case-09 All conflict markers in checkout.ts and cart.ts have been edited out. I am ready to stage the files. What verification steps should be performed prior to staging? | pass→pass | 8,129 | 4,649 | -43% | 1 | 1 | 0% | 1,514 | 1,092 | -28% | 0 | 0 | — |
▸case-10 After clearing conflict markers and confirming that npm test and npm run build pass, what git command step should be performed next before summarizing results? | pass→pass | 3,902 | 2,317 | -41% | 1 | 1 | 0% | 686 | 606 | -12% | 0 | 0 | — |
▸case-11 A merge conflict occurred in yarn.lock on our React project. A developer suggested opening yarn.lock in VS Code, accepting incoming changes, and manually editing the syntax errors. What is the recommended strategy? | pass→pass | 8,885 | 6,620 | -25% | 1 | 1 | 0% | 1,637 | 1,353 | -17% | 0 | 0 | — |
▸case-12 We resolved a large merge conflict across 10 files in a C# solution. Before running dotnet build, what check should be conducted on all modified files regarding git markers? | pass→pass | 4,208 | 4,949 | +18% | 1 | 1 | 0% | 694 | 1,015 | +46% | 0 | 0 | — |
▸case-13 We resolved a conflict where two different default timeout values (5000ms vs 10000ms) were configured in config.ts. We selected 10000ms to ensure stability under load. Where and how should this decision be documented in the final output? | fail→pass | 8,448 | 2,903 | -66% | 1 | 1 | 0% | 1,627 | 737 | -55% | 0 | 0 | — |
▸case-14 In routes.js, main added /api/v1/users to the route array while feature added /api/v1/billing at the same line position. Should one route be discarded, or should both be kept? | pass→pass | 6,301 | 3,422 | -46% | 1 | 1 | 0% | 1,125 | 768 | -32% | 0 | 0 | — |
▸case-15 We cleared conflict markers in server.ts and confirmed the TypeScript code compiles. Is compilation alone sufficient before staging files, or should additional code quality checks be run? | pass→pass | 9,168 | 4,192 | -54% | 1 | 1 | 0% | 1,442 | 929 | -36% | 0 | 0 | — |
▸case-16 Our repository uses pnpm, and pnpm-lock.yaml has merge conflict markers after rebasing. How should we clean up pnpm-lock.yaml? | pass→pass | 8,108 | 6,289 | -22% | 1 | 1 | 0% | 1,504 | 1,345 | -11% | 0 | 0 | — |
▸case-17 While fixing a merge conflict in utils/date.js, we found three unused export functions from 2 years ago. Should we delete these unused functions while fixing the merge conflict? | pass→pass | 7,944 | 3,292 | -59% | 1 | 1 | 0% | 1,301 | 715 | -45% | 0 | 0 | — |
▸case-19 At the end of a conflict resolution workflow, what information regarding project health must be explicitly reported in the final output breakdown? | fail→pass | 11,053 | 2,709 | -75% | 1 | 1 | 0% | 1,848 | 626 | -66% | 0 | 0 | — |
▸case-20 We need to push our master branch to GitHub and create a release tag v2.4.0 with release notes detailing new features. Please execute the git push and git tag commands for release deployment. | pass→fail | 4,945 | 3,809 | -23% | 1 | 1 | 0% | 910 | 378 | -58% | 0 | 0 | — |
▸case-21 I have 6 separate commits on my topic branch that I want to clean up before requesting code review. Please guide me through running git rebase -i HEAD~6 to squash fixup commits into a single clean commit message. | pass→pass | 12,123 | 13,670 | +13% | 1 | 1 | 0% | 2,383 | 2,279 | -4% | 0 | 0 | — |
▸case-22 Our Postgres database connection layer in db/client.ts uses deprecated callback patterns across 15 repository files. Please refactor all 15 files to use async/await and update all SQL query helper signatures. | pass→fail | 12,047 | 5,088 | -58% | 1 | 1 | 0% | 2,539 | 498 | -80% | 0 | 0 | — |