paseo-bot[bot]and见安 9b92b2e25c Preserve base worktree paths when merging (#6668) ...

* fix(git): preserve the base worktree path when merging

* test(git): cover merging into whitespace worktree paths

* test(git): follow the server object parameter convention

* test(git): keep merge fixture line endings deterministic

Disable automatic CRLF checkout in the fixture repository so the exact-content assertion works with Windows Git defaults.

Co-authored-by: 见安 <73627805+Mar-garet@users.noreply.github.com>

---------

Co-authored-by: 见安 <73627805+Mar-garet@users.noreply.github.com>
Co-authored-by: paseo-bot[bot] <266920839+paseo-bot[bot]@users.noreply.github.com>

2026-10-12 06:00:59 +02:00

..

app

fix(app): keep typechecking after Expo generates environment types (#6656)

2026-10-12 02:49:09 +02:00

cli

test(cli): accept Codex catalogs without branded model IDs (#6633)

2026-10-11 19:47:10 +02:00

client

fix(ios): address clipped chat and Markdown text (#6445)

2026-10-09 16:35:43 +01:00

desktop

fix(desktop): show the Paseo window icon on Linux (#6645)

2026-10-11 23:57:52 +02:00

expo-two-way-audio

fix(ios): address clipped chat and Markdown text (#6445)

2026-10-09 16:35:43 +01:00

highlight

fix(ios): address clipped chat and Markdown text (#6445)

2026-10-09 16:35:43 +01:00

plugin

fix(ios): address clipped chat and Markdown text (#6445)

2026-10-09 16:35:43 +01:00

protocol

Keep terminal CJK text unchanged after returning to a workspace (#6452)

2026-10-10 13:27:04 +02:00

relay

fix(ios): address clipped chat and Markdown text (#6445)

2026-10-09 16:35:43 +01:00

server

Preserve base worktree paths when merging (#6668)

2026-10-12 06:00:59 +02:00

website

Accept daemon settings in the published editor schema (#6621)

2026-10-11 18:50:03 +02:00