Passed #16915 `but resolve conflicts <commit>` prints an `apply` for that commit
Tasks1717 passed · 7 skipped
Tests5,0825,082 passed · 8 skipped
Wall time1m58sbudget 3m00s
Task time7m09s3.6× parallel
Slowest1m53sgpui-test · windows
Changed3files since the merge base
Tests6 tasks · 3 skipped · 4m05s · 5,082 tests
Lint6 tasks · 2 skipped · 1m29s
Format1 task · 1 skipped · 6s
Docs1 task · 23s
Dependencies2 tasks · 26s
Other1 task · 1 skipped · 37s
Timeline
030s1m1m30s2m
Timelinuxhetzner-linuxPassed
1m06s
prepare
2s
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 | 1m03s2,130 tests passed | 51s2,131 tests passed | – |
| doctest | Tests | 0s passed | 0s passed | – |
| ui-react-stories | Tests | – | skipped | – |
| test-without-nightly | Tests | skipped | – | – |
| test-modern-but | Tests | 14s379 tests passed | – | – |
| api-macros | Other | skipped | – | – |
| fmt | Format | 6s passed | – | – |
| machete | Dependencies | 22s passed | – | – |
| deny | Dependencies | 3s passed | – | – |
| clippy | Lint | 14s passed | – | – |
| clippy-no-default-features | Lint | 14s passed | – | – |
| clippy-all-features | Lint | 14s passed | – | – |
| check-features | Lint | 33s passed | – | – |
| doc | Docs | 23s passed | – | – |
| prettier | Format | skipped | – | – |
| node-lint | Lint | skipped | – | – |
| node-check | Lint | skipped | – | – |
| node-test | Tests | skipped | – | – |
| but-sdk | Other | 37s passed | – | – |
| windows-check | Lint | – | – | 10s passed |
| gpui-clippy | Lint | – | – | 3s passed |
| gpui-test | Tests | – | – | 1m53s442 tests passed |
3 changed files since the merge base
crates/but/src/command/legacy/resolve.rscrates/but/tests/but/command/resolve.rscrates/but/tests/fixtures/scenario/two-conflicted-commits-in-one-branch.sh