Passed #16886 Applying a branch no longer gets conflicts wrong when stacks are on mixed bases
Tasks1717 passed · 7 skipped
Tests7,9527,952 passed · 12 skipped
Wall time11m47sbudget 3m00s
Task time16m33s1.4× parallel
Slowest8m50stest · macos
Changed3files since the merge base
Tests6 tasks · 3 skipped · 12m30s · 7,952 tests
Lint6 tasks · 2 skipped · 1m11s
Format1 task · 1 skipped · 5s
Docs1 task · 1m29s
Dependencies2 tasks · 29s
Other1 task · 1 skipped · 46s
Timeline
01m2m3m4m5m6m7m8m9m
Timelinuxhetzner-linuxPassed
1m38s
prepare
3s
skipped (6)test-without-nightly, api-macros, prettier, node-lint, node-check, node-test
| Task | Type | linuxPassed | macosPassed | windowsPassed |
|---|---|---|---|---|
| fetch & prepare | setup log | setup log | setup log | |
| test | Tests | 1m19s3,568 tests passed | 8m50s3,568 tests passed | – |
| doctest | Tests | 0s passed | 0s passed | – |
| test-without-nightly | Tests | skipped | – | – |
| test-modern-but | Tests | 28s379 tests passed | – | – |
| api-macros | Other | skipped | – | – |
| fmt | Format | 5s passed | – | – |
| machete | Dependencies | 22s passed | – | – |
| deny | Dependencies | 7s passed | – | – |
| clippy | Lint | 6s passed | – | – |
| clippy-no-default-features | Lint | 4s passed | – | – |
| clippy-all-features | Lint | 3s passed | – | – |
| check-features | Lint | 50s passed | – | – |
| doc | Docs | 1m29s passed | – | – |
| prettier | Format | skipped | – | – |
| node-lint | Lint | skipped | – | – |
| node-check | Lint | skipped | – | – |
| node-test | Tests | skipped | – | – |
| but-sdk | Other | 46s passed | – | – |
| ui-react-stories | Tests | – | skipped | – |
| windows-check | Lint | – | – | 3s passed |
| gpui-clippy | Lint | – | – | 3s passed |
| gpui-test | Tests | – | – | 1m50s437 tests passed |
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