Overview
| Comment: | Merge branch 'fix/revert-swap-chain' into feat/submanifest-reader
# Conflicts: # internal/checkout/revert.go |
|---|---|
| Timelines: | family | ancestors | descendants | both | main | trunk | feat/submanifest-reader |
| Files: | files | file ages | folders |
| SHA3-256: |
32155296d09a51a204a34a1e420c3525 |
| User & Date: | [email protected] on 2026-10-20 02:40:08.000 |
| Other Links: | branch diff | manifest | tags |
Context
|
2026-10-20
| ||
| 03:01 |
Merge remote-tracking branch 'origin/main' into feat/submanifest-reader
# Conflicts: # internal/checkout/vfile.go check-in: 741864259c user: [email protected] tags: feat/submanifest-reader, main, trunk | |
| 02:45 | Merge branch 'feat/submanifest-reader' into feat/sparse-store check-in: e4f56e44a9 user: [email protected] tags: feat/submanifest-reader, main, trunk | |
| 02:40 |
Merge branch 'fix/revert-swap-chain' into feat/submanifest-reader
# Conflicts: # internal/checkout/revert.go check-in: 32155296d0 user: [email protected] tags: feat/submanifest-reader, main, trunk | |
| 02:37 | Merge branch 'fix/symlink-write-paths' into feat/submanifest-reader check-in: 79679cc3fa user: [email protected] tags: feat/submanifest-reader, main, trunk | |
| 01:30 | Merge branch 'feat/submanifest-reader' into fix/revert-swap-chain check-in: c7a321a35d user: [email protected] tags: feat/submanifest-reader, main, trunk | |
Changes
Modified CHANGELOG.md
from [e0dce3c97e]
to [610e2e10bb].
[diff]
Modified checkout.go
from [563ee8840a]
to [5e7c7b6cea].
[diff]
Added checkout_revert_renames_interop_test.go version [c1f43438a6].
Modified cli/repo_stage_test.go
from [4a84b6b406]
to [b99ec6041c].
[diff]
Modified internal/checkout/perm_unix_test.go
from [2f27efce99]
to [8679fcea46].
[diff]
Modified internal/checkout/revert.go
from [fd48c26468]
to [e85b97fa43].
[diff]
Added internal/checkout/revert_undo.go version [d34d33fc95].
Added internal/checkout/revert_undo_js.go version [b9343919d4].