Rebase ni/v2 onto main to unify v2 rewrite with main history

[Copilot]

The ni/v2 branch was created as an orphan branch (no shared history with main). This PR rebases all v2 commits onto main to establish proper lineage before merge.

Changes

• Rebased 6 commits from ni/v2 onto main using git rebase --onto main --root
• Resolved conflicts by accepting v2 version (complete rewrite)
• Preserved original commit messages, authors, and dates:
  • save (Dec 12)
  • updated nix (Dec 15)
  • flake update (Dec 16)
  • stuff (Dec 17)
  • so far so good (Dec 22)
  • chore: remove sym (Dec 23)

Result

Branch now has main's full history as ancestor (merge-base: bfec614). ~9,772 insertions / ~1,582 deletions representing the v2 rewrite.

Original prompt

Goal

Rebase the ni/v2 branch onto main so that the v2 rewrite has the full main history as its ancestor, while preserving the individual commits from ni/v2.

Background

The ni/v2 branch is a complete rewrite of the project but was started as an orphan branch (no shared history with main). We want to:

1. Keep the main branch history
2. Apply all the ni/v2 commits on top of main
3. Preserve the individual commits from ni/v2 (not squash them)

Commits to preserve from ni/v2 (in chronological order):

1. fe3e5c5 - "save" (Dec 12, 2025) - root commit
2. f73e20b - "updated nix" (Dec 15, 2025)
3. 7675f63 - "flake update" (Dec 16, 2025)
4. 76ed2d5 - "stuff" (Dec 17, 2025)
5. 8a79121 - "so far so good" (Dec 22, 2025)
6. 2c7db75 - "chore: remove sym" (Dec 22, 2025)

Steps

1. Create a new branch from main
2. Apply each commit from ni/v2 in order, preserving commit messages
3. The end result should be a branch that:
   • Has main's full history as its base
   • Contains all the v2 rewrite changes from ni/v2
   • Preserves the individual commit history from ni/v2

Technical Approach

This is essentially a git rebase --onto main operation for the ni/v2 branch, or alternatively:

1. Cherry-pick each commit from ni/v2 onto a new branch based on main
2. Or use git rebase --onto main --root ni/v2

The resulting PR should show the complete v2 rewrite ready to be merged into main.

This pull request was created from Copilot chat.

---

✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.