Passed #16941 `but resolve` finds conflicted commits on worktree branches
Tasks1616 passed · 8 skipped
Tests4,7674,767 passed · 8 skipped
Wall time2m53sbudget 3m00s
Task time12m02s4.2× parallel
Slowest1m53stest · linux
Changed6files since the merge base
Tests5 tasks · 4 skipped · 3m36s · 4,767 tests
Lint5 tasks · 3 skipped · 4m12s
Format2 tasks · 17s
Docs1 task · 1m50s
Dependencies2 tasks · 30s
Other1 task · 1 skipped · 1m33s
Timeline
030s1m1m30s2m2m30s3m
Timelinuxhetzner-linuxPassed
2m41s
prepare
2s
skipped (5)test-without-nightly, api-macros, node-lint, node-check, node-test
windows (advisory)aws-windows-testPassed
23s
prepare
1s
skipped (2)gpui-clippy, gpui-test
| Task | Type | linuxPassed | macosPassed | windowsPassed |
|---|---|---|---|---|
| fetch & prepare | setup log | setup log | setup log | |
| windows-check | Lint | – | – | 21s passed |
| gpui-clippy | Lint | – | – | skipped |
| gpui-test | Tests | – | – | skipped |
| test | Tests | 1m53s2,191 tests passed | 1m20s2,192 tests passed | – |
| doctest | Tests | 0s passed | 2s passed | – |
| ui-react-stories | Tests | – | skipped | – |
| test-without-nightly | Tests | skipped | – | – |
| test-modern-but | Tests | 20s384 tests passed | – | – |
| api-macros | Other | skipped | – | – |
| fmt | Format | 5s passed | – | – |
| machete | Dependencies | 24s passed | – | – |
| deny | Dependencies | 6s passed | – | – |
| clippy | Lint | 49s passed | – | – |
| clippy-no-default-features | Lint | 47s passed | – | – |
| clippy-all-features | Lint | 48s passed | – | – |
| check-features | Lint | 1m25s passed | – | – |
| doc | Docs | 1m50s passed | – | – |
| prettier | Format | 12s passed | – | – |
| node-lint | Lint | skipped | – | – |
| node-check | Lint | skipped | – | – |
| node-test | Tests | skipped | – | – |
| but-sdk | Other | 1m33s passed | – | – |
6 changed files since the merge base
crates/but/skill/SKILL.mdcrates/but/src/command/legacy/pull/mod.rscrates/but/src/command/legacy/resolve.rscrates/but/src/id/mod.rscrates/but/tests/but/command/pull.rscrates/but/tests/but/command/resolve.rs
Other runs of this PR
Status
PR / branch
Author
Commit
Platforms
Progress
Queued
Actions
Passed
#16941`but resolve` finds conflicted commits on worktree branchesclaude/resolve-conflicted-commit-worktree-0b1603
krlvi
linux passedmacos passedwindows passed
2m53sslowest linux/test 1m53s
9h ago
Passed
#16941`but resolve` finds conflicted commits on worktree branchesclaude/resolve-conflicted-commit-worktree-0b1603
krlvi
linux passedmacos passedwindows passed
2m28sslowest windows/gpui-test 2m26s
9h ago