▸case-01 I'm currently stuck on a rebase of my feature branch onto main because several files have merge conflicts. Can you examine the context behind the conflicting edits, resolve all the conflict hunks appropriately, execute the repository's verification checks to catch any broken code, and finalize the rebase? | fail→fail | 9,508 | 7,377 | -22% | 1 | 1 | 0% | 197 | 435 | +121% | 0 | 0 | — |
▸case-02 I attempted `git merge feature/payment-gateway` into `main`, but hit conflicts in `checkout.ts` and `api.ts`. Please go through the conflicting sections, reconcile the changes based on what each branch was trying to achieve, run the project's local checks and tests to ensure no regressions, and finish the merge commit. | fail→fail | 5,012 | 4,473 | -11% | 1 | 1 | 0% | 174 | 433 | +149% | 0 | 0 | — |
▸case-03 Our branch has dirty conflict markers after pulling updates from upstream. Could you take over resolving the conflicted files, make sure the project's formatting and test commands run cleanly afterward, and stage and complete the final commit? | fail→fail | 4,173 | 4,608 | +10% | 1 | 1 | 0% | 123 | 393 | +220% | 0 | 0 | — |
▸case-04 I hit several conflicts during a git merge of `refactor/auth` into `main`. The conflicts look messy and confusing. Should I just run `git merge --abort` to start over or clean up, or how should I handle completing this merge? | fail→fail | 12,464 | 3,492 | -72% | 1 | 1 | 0% | 2,066 | 650 | -69% | 0 | 0 | — |
▸case-05 While resolving a conflict in `user_service.py` between `feature/caching` and `main`, both branches touched the user lookup function. To make things cleaner, should I refactor the function to use a completely new AsyncUserClient pattern that neither branch used? | pass→pass | 9,623 | 3,154 | -67% | 1 | 1 | 0% | 1,498 | 669 | -55% | 0 | 0 | — |
▸case-06 In `config.go`, main changed the timeout to 30s for stability, while feature/fast-response changed it to 5s for low latency. They cannot coexist. The goal of this merge PR is to improve stability on main. Which timeout value should be kept and how should this be documented? | pass→fail | 8,289 | 5,423 | -35% | 1 | 1 | 0% | 1,365 | 507 | -63% | 0 | 0 | — |
▸case-07 We have resolved conflict markers in our TypeScript project. Should we run `prettier --write` first, then unit tests, then typechecking with `tsc`? | fail→pass | 11,908 | 7,645 | -36% | 1 | 1 | 0% | 1,850 | 1,385 | -25% | 0 | 0 | — |
▸case-08 I have conflict markers in `order_processor.kt`. Can I just look at the raw `<<<<<<<` and `>>>>>>>` conflict blocks in the file and pick whichever lines look cleaner without looking up git logs or PR tickets? | pass→pass | 12,850 | 5,448 | -58% | 1 | 1 | 0% | 1,947 | 1,013 | -48% | 0 | 0 | — |
▸case-09 In `router.ts`, `main` added logging middleware `app.use(logger)` and `feature/metrics` added metrics middleware `app.use(metrics)` at the exact same line in the setup function. Should I discard `app.use(metrics)` so I don't have to keep both? | pass→fail | 7,147 | 6,179 | -14% | 1 | 1 | 0% | 1,190 | 609 | -49% | 0 | 0 | — |
▸case-10 I am in the middle of a multi-commit rebase with conflicts on commit 2 of 5. I resolved the files and staged them with `git add`. Should I immediately run `git commit -m 'fixed'` to complete the rebase? | pass→pass | 6,465 | 4,947 | -23% | 1 | 1 | 0% | 1,051 | 962 | -8% | 0 | 0 | — |
▸case-11 When resolving conflicts during a rebase that spans multiple commits, what is the procedure after staging resolved files for a single commit step? | pass→pass | 6,757 | 4,472 | -34% | 1 | 1 | 0% | 1,089 | 906 | -17% | 0 | 0 | — |
▸case-12 All conflict markers in `checkout.py` have been manually removed, but running `pytest` now shows 2 failing tests due to an updated parameter signature from main. Should I commit now since conflict markers are gone? | pass→pass | 7,020 | 4,887 | -30% | 1 | 1 | 0% | 1,218 | 944 | -22% | 0 | 0 | — |
▸case-13 Our production build has a regression introduced sometime in the last 50 commits. How do I use `git bisect` to locate the faulty commit automatically using a test script? | pass→pass | 9,198 | 10,506 | +14% | 1 | 1 | 0% | 1,651 | 1,711 | +4% | 0 | 0 | — |
▸case-14 How do I configure git globally so that conflict markers always display the common ancestor baseline in addition to OURS and THEIRS? | pass→pass | 6,534 | 4,159 | -36% | 1 | 1 | 0% | 1,151 | 870 | -24% | 0 | 0 | — |
▸case-15 I have 4 clean commits on my feature branch with no merge conflicts. How do I combine (squash) them into a single clean commit using interactive rebase before submitting a pull request? | pass→pass | 8,955 | 6,751 | -25% | 1 | 1 | 0% | 1,657 | 1,417 | -14% | 0 | 0 | — |
▸case-16 I finished staging resolved conflict files in a repository I'm working in for the first time. How do I determine which automated verification checks need to be run before committing? | pass→pass | 13,112 | 9,742 | -26% | 1 | 1 | 0% | 2,259 | 1,928 | -15% | 0 | 0 | — |
▸case-17 While running `git rebase main` on my branch, git paused on step 3 with conflicts in `db/schema.sql`. My team member suggested running `git rebase --abort` whenever conflicts happen to avoid breaking history. Is that the correct workflow? | pass→fail | 9,448 | 6,135 | -35% | 1 | 1 | 0% | 1,608 | 645 | -60% | 0 | 0 | — |
▸case-18 When starting to tackle a complex conflict after running `git pull origin main`, what is the very first step before editing any conflict markers? | pass→pass | 8,098 | 2,758 | -66% | 1 | 1 | 0% | 1,363 | 630 | -54% | 0 | 0 | — |
▸case-19 I edited `api/v1/users.go` to remove conflict markers. Can I run `git commit` immediately without running `git add`? | pass→pass | 6,502 | 4,920 | -24% | 1 | 1 | 0% | 1,134 | 981 | -13% | 0 | 0 | — |
▸case-20 During a merge of `refactor/strict-types` into `main`, `main` added a dynamic `any` fallback for legacy clients, while `refactor/strict-types` removed `any` fallbacks entirely to enforce strict typing. The goal of this merge PR is strict type safety. Which approach should be chosen? | pass→pass | 7,805 | 3,635 | -53% | 1 | 1 | 0% | 1,433 | 772 | -46% | 0 | 0 | — |
▸case-21 I resolved conflicts in `auth.ts`. I ran formatting first, and it formatted fine. Then I ran tests, and 1 test failed because of missing type definitions. What is the correct diagnostic and check execution sequence? | fail→fail | 11,156 | 5,478 | -51% | 1 | 1 | 0% | 1,852 | 1,098 | -41% | 0 | 0 | — |
▸case-22 I resolved conflict markers in 10 files. Should I commit the merge immediately to save my work, and let CI run typechecking and tests later? | fail→pass | 9,401 | 5,319 | -43% | 1 | 1 | 0% | 1,502 | 997 | -34% | 0 | 0 | — |