merge: reconcile diverged histories — ub01 working tree is source of truth

Browse source

Local auto-mode (M005-M007) and origin/main (M004 manual pushes from ub01) diverged
at e08e8d0. Commit 7aa33cd accidentally deleted 78 project files during auto-mode.
The ub01 working tree has all features running correctly.

This merge uses 'ours' strategy to record origin/main as an ancestor, then the
following commit overlays the correct file state from ub01.

...

This commit is contained in:

jlightner 2026-03-31 02:10:31 +00:00

parent 7d4eddce99 64ff263da2

commit f6dcc80dbf

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available