Repository navigation

Workspace merge function — integrated onto develop (CI) - #145

Open

jeffmaki wants to merge 7 commits into

workspace-merge-function-ci

Open

Workspace merge function — integrated onto develop (CI)#145
jeffmaki wants to merge 7 commits into
developfrom
workspace-merge-function-ci

Commits on Oct 13, 2025
- Add initial workspace merge function
  cyrossignol
  committed
  602b2b0
Commits on Oct 7, 2026
- Merge branch 'workspace-merge-function' into develop (local review of draft PR #143)
  jeffmaki
  committed
  28dff95
Commits on Oct 14, 2026
- Point /new-api devProxy at the working dev backend
  
  jeffmaki
  and
  claude
  committed
  b929db9
Commits on Oct 15, 2026
- Dedupe identical elements created on both sides in workspace merge
  
  jeffmaki
  and
  claude
  committed
  76827aa
- Merge remote-tracking branch 'origin/develop' into workspace-merge-function-ci
  
  jeffmaki
  and
  claude
  committed
  0f13ebf
- Recheck remapped references before deduping created-on-both-sides parents
  
  jeffmaki
  and
  claude
  committed
  4790b2d
- Restore vi import dropped in develop merge
  
  jeffmaki
  and
  claude
  committed
  b950fd0