+
Skip to content

Can't recover from a submodule pointer move #276

@pablo-mayrgundter

Description

@pablo-mayrgundter

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:

Image Image

Metadata

Metadata

Assignees

No one assigned

    Labels

    bugSomething isn't working

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions

      点击 这是indexloc提供的php浏览器服务,不要输入任何密码和下载