Passed #16941 `but resolve` finds conflicted commits on worktree branches
Tasks1818 passed · 6 skipped
Tests5,2485,248 passed · 8 skipped
Wall time2m28sbudget 3m00s
Task time9m06s3.7× parallel
Slowest2m26sgpui-test · windows
Changed6files since the merge base
Tests6 tasks · 3 skipped · 5m06s · 5,248 tests
Lint6 tasks · 2 skipped · 2m06s
Format2 tasks · 15s
Docs1 task · 39s
Dependencies2 tasks · 28s
Other1 task · 1 skipped · 30s
Timeline
030s1m1m30s2m2m30s
Timelinuxhetzner-linuxPassed
1m26s
prepare
2s
skipped (5)test-without-nightly, api-macros, node-lint, node-check, node-test
| Task | Type | linuxPassed | macosPassed | windowsPassed |
|---|---|---|---|---|
| fetch & prepare | setup log | setup log | setup log | |
| windows-check | Lint | – | – | 15s passed |
| gpui-clippy | Lint | – | – | 17s passed |
| gpui-test | Tests | – | – | 2m26s483 tests passed |
| test | Tests | 1m22s2,190 tests passed | 1m05s2,191 tests passed | – |
| doctest | Tests | 0s passed | 0s passed | – |
| ui-react-stories | Tests | – | skipped | – |
| test-without-nightly | Tests | skipped | – | – |
| test-modern-but | Tests | 10s384 tests passed | – | – |
| api-macros | Other | skipped | – | – |
| fmt | Format | 5s passed | – | – |
| machete | Dependencies | 23s passed | – | – |
| deny | Dependencies | 5s passed | – | – |
| clippy | Lint | 21s passed | – | – |
| clippy-no-default-features | Lint | 20s passed | – | – |
| clippy-all-features | Lint | 21s passed | – | – |
| check-features | Lint | 29s passed | – | – |
| doc | Docs | 39s passed | – | – |
| prettier | Format | 10s passed | – | – |
| node-lint | Lint | skipped | – | – |
| node-check | Lint | skipped | – | – |
| node-test | Tests | skipped | – | – |
| but-sdk | Other | 30s 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