Repository navigation

feat: make --three-way-merge work without patch permissions - #1063

Merged

yxxhero merged 8 commits into

databus23:masterfrom

oreonl:three-way-merge-without-patch-permission

Sep 11, 2026

Merged

feat: make --three-way-merge work without patch permissions#1063
yxxhero merged 8 commits into
databus23:masterfrom
oreonl:three-way-merge-without-patch-permission

Commits on Aug 31, 2026
- feat: make --three-way-merge work without patch permissions
  
  oreonl
  and
  claude
  committed
  ec4e153
- fix: treat empty collections and null as the same value
  
  oreonl
  and
  claude
  committed
  e4cae5b
Commits on Sep 2, 2026
- fix: address review feedback on --three-way-merge-mode
  
  oreonl
  and
  claude
  committed
  3d2f839
Commits on Sep 3, 2026
- fix: name the right object in a createPatch error message
  
  oreonl
  and
  claude
  committed
  f0976bf
- fix lint
  oreonl
  committed
  ffa1123
Commits on Sep 4, 2026
- fix: stop the local merge from hiding real changes
  
  oreonl
  and
  claude
  committed
  ca059ad
- fix: correct the 405 fallback, the RBAC role and the env var examples
  
  oreonl
  and
  claude
  committed
  d8d73ff
Commits on Sep 11, 2026
- docs: document the unknown-field deviation of client mode
  yxxhero
  committed
  7a91a78