[dolt migrate]: migration failed with conflicts

[mango-lzp]

I can't see any conflicts in this table, and it blocked migration.
I successed migrate in another database, but this one doesn't work.
Am I missed something ?
Thanks to help me!

[mango-lzp]

I went to check the code, I found this err will be throwed when [HasConflicts] fn is called.
And I found conflict resolve can clear conflictSchemasKey to make [HasConflicts] return false.
I tried to use "dolt conflicts resolve --ours ." to clear conflictSchemasKey.

but it still show failed with conflicts (auth).

I am a frontend programmer, “go” language is hard to read for me.
I think I am close, Plz do me a favor.

[max-hoffman]

Hey @druvv , @mango-lzp has been very patient working through system table performance improvements with me. Would you mind helping them migrate this repo? I think they will see a happy speed up in some of their join queries on __DOLT__. The work I am doing to index system table commit columns will only apply to the new format, also.

[andy-wm-arthur]

@mango-lzp currently there is no path to migrate conflicts in the history. Conflict storage works very differently in the old and new storage formats. Are you hoping to migrate the conflicts for this commit? Or would it be sufficient to drop them on migration?

[druvv]

Hi @mango-lzp, if you want the migration to work and you don't care about the conflicts themselves you can run this query:

dolt filter-branch --all "delete * from dolt_conflicts_auth;"

This will delete the conflicts from all branches and commits where you may have had conflicts.

After running the above, try dolt migrate again.

[mango-lzp]

@mango-lzp currently there is no path to migrate conflicts in the history. Conflict storage works very differently in the old and new storage formats. Are you hoping to migrate the conflicts for this commit? Or would it be sufficient to drop them on migration?

Hi @andrew-wm-arthur , It suggests that there is a conflict, but I can't see any conflicts in dolt_conflicts table. It is so confusing.

[mango-lzp]

Hi @mango-lzp, if you want the migration to work and you don't care about the conflicts themselves you can run this query:

dolt filter-branch --all "delete * from dolt_conflicts_auth;"

This will delete the conflicts from all branches and commits where you may have had conflicts.

After running the above, try dolt migrate again.

I tried to run [dolt filter-branch --all "delete from dolt_conflicts_auth;"], but it still failed.

[zachmu]

Hey @mango-lzp,

Sorry for the frustration. We're going to add a --force option to the migrate tool that will drop conflicts since the other techniques aren't working for you. We'll update here when it's available in a release.

Thanks,

Zach

[mango-lzp]

@zachmu Thank you very much! I will keep my eyes on it.

[andy-wm-arthur]

@mango-lzp you can now use dolt migrate --drop-conflicts to ignore conflicts on migration. We'll get a release out today so you can use it

[max-hoffman]

v0.51.4 has been released. Let us know if you still have issues with --drop-conflicts.

[mango-lzp]

@andrew-wm-arthur @max-hoffman Thanks a lot, I am trying to write shell script to deal with conflicts left over from history. I use --drop-conflicts in another dolt, It did work!. I got a fast query time in log query about 2 sec! Thanks again!