Repository navigation

Resolve cloud conflicts item by item so Edit placement stays open - #266

Merged

SunkenInTime merged 8 commits into

mainfrom

t3/lineup-edit-survives-reload

Oct 10, 2026

Merged

Resolve cloud conflicts item by item so Edit placement stays open#266
SunkenInTime merged 8 commits into
mainfrom
t3/lineup-edit-survives-reload

Commits on Oct 9, 2026
- Keep a placement edit open when its page reloads
  
  SunkenInTime
  and
  claude
  committed
  580ac52
- End a drag that a page reload took back
  
  SunkenInTime
  and
  claude
  committed
  eacec3f
- Let the reload alone decide which drag carries on
  
  SunkenInTime
  and
  claude
  committed
  8fed3da
- Clear a taken-back drag once its end is gone
  
  SunkenInTime
  and
  claude
  committed
  2df842b
Commits on Oct 10, 2026
- Resolve a conflict item by item, not by reloading the page
  
  SunkenInTime
  and
  claude
  committed
  deae14e
- Restore failed discards over holds; resume held-back changes after
  
  SunkenInTime
  and
  claude
  committed
  eb4c0a1
- Merge remote-tracking branch 'origin/main' into t3/lineup-edit-survives-reload
  SunkenInTime
  committed
  e314496
- Pin how Save of a placement edit merges by field
  
  SunkenInTime
  and
  claude
  committed
  b8c3f30