-
Notifications
You must be signed in to change notification settings - Fork 1
Open
Labels
bugSomething isn't workingSomething isn't working
Description
I did a merge to get a PR ready (https://github.com/bldrs-ai/conway/pull/271/files) and I think yarn setup
pulled in a submodule update. This is in a clone of main repo, not a fork.
I can't figure out how to reset the merge to origin/main's conway-geom pointer.
Here's what CG says, and it makes sense to me, but it doesn't work:
> git ls-tree origin/main dependencies/conway-geom
160000 commit 11202215be0c6e2f16ce0bc584c5cefaaec81fe8 dependencies/conway-geom
> git update-index --cacheinfo 160000 11202215be0c6e2f16ce0bc584c5cefaaec81fe8 dependencies/conway-geom
> git add ... ; git commit ...
And this is indeed what the head version is at
And then verify with a delta to head. EXPECTED: no diff. ACTUAL: still the wrong pointer:
Metadata
Metadata
Assignees
Labels
bugSomething isn't workingSomething isn't working