8000 Merge Fail · Issue #1932 · urbit/urbit · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
Merge Fail< 85DB /bdi> #1932
Open
Open
@minderfolden

Description

@minderfolden

Ran |merge %base (sein:title our now our) %kids to kick a sync since my hash is out of phase.

Got this:

> |merge %base (sein:title our now our) %kids
>=
%fine merge failed, trying %meet
auto merge failed on strategy %meet
%merge-criss-cross
[p=~batten q=%kids]
[p=~minder-folden q=%base]
[%da p=~2019.11.9..23.17.40..2afc]
2
~minder-folden:dojo> 

Just for completeness sake when I run .^(@uv %cz /=base=) I'm getting 0v1a.764el.bhbjb.ejfm9.b4k9b.tneto.o5qkp.vbmpv.lu1sa.br0n6.a24uq so I don't know if that's related to this or not.

Metadata

Metadata

Assignees

No one assigned

    Labels

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions

      0