Passed #16886 Applying a branch no longer gets conflicts wrong when stacks are on mixed bases
Tasks1818 passed · 6 skipped
Tests10,01310,013 passed · 24 skipped
Wall time8m00sbudget 3m00s
Task time29m49s3.7× parallel
Slowest5m17stest · macos
Changed3files since the merge base
Tests7 tasks · 2 skipped · 18m16s · 10,013 tests
Lint6 tasks · 2 skipped · 7m22s
Format1 task · 1 skipped · 6s
Docs1 task · 1m23s
Dependencies2 tasks · 31s
Other1 task · 1 skipped · 2m09s
Timeline
01m2m3m4m5m6m
Timelinuxhetzner-linuxPassed
4m05s
prepare
2s
skipped (5)api-macros, prettier, node-lint, node-check, node-test
| Task | Type | linuxPassed | macosPassed | windowsPassed |
|---|---|---|---|---|
| fetch & prepare | setup log | setup log | setup log | |
| windows-check | Lint | – | – | 30s passed |
| gpui-clippy | Lint | – | – | 31s passed |
| gpui-test | Tests | – | – | 2m39s437 tests passed |
| test | Tests | 3m40s3,568 tests passed | 5m17s3,568 tests passed | – |
| doctest | Tests | 2m10s0 tests passed | 56s0 tests passed | – |
| test-without-nightly | Tests | 2m40s2,061 tests passed | – | – |
| test-modern-but | Tests | 50s379 tests passed | – | – |
| api-macros | Other | skipped | – | – |
| fmt | Format | 6s passed | – | – |
| machete | Dependencies | 23s passed | – | – |
| deny | Dependencies | 8s passed | – | – |
| clippy | Lint | 1m09s passed | – | – |
| clippy-no-default-features | Lint | 1m09s passed | – | – |
| clippy-all-features | Lint | 1m08s passed | – | – |
| check-features | Lint | 2m53s passed | – | – |
| doc | Docs | 1m23s passed | – | – |
| prettier | Format | skipped | – | – |
| node-lint | Lint | skipped | – | – |
| node-check | Lint | skipped | – | – |
| node-test | Tests | skipped | – | – |
| but-sdk | Other | 2m09s passed | – | – |
| ui-react-stories | Tests | – | skipped | – |
3 changed files since the merge base
crates/but-workspace/src/commit/mod.rscrates/but-workspace/tests/fixtures/scenario/various-heads-on-mixed-bases.shcrates/but-workspace/tests/workspace/commit/mod.rs
Other runs of this PR
Status
PR / branch
Author
Commit
Platforms
Progress
Queued
Actions
Passed
#16886Applying a branch no longer gets conflicts wrong when stacks are on mixed basesclaude/gallant-mcclintock-34dcfb
krlvi
linux passedmacos passedwindows passed
11m47sslowest macos/test 8m50s
1d ago
Passed
#16886Applying a branch no longer gets conflicts wrong when stacks are on mixed basesclaude/gallant-mcclintock-34dcfb
krlvi
linux passedmacos passedwindows passed
8m00sslowest macos/test 5m17s
1d ago