I think for autoresolution to work you need to delete one of the .moved files. Or you can, as you worked out, run resolve --all. But the interface here is not very good.
I think for autoresolution to work you need to delete one of the .moved files. Or you can, as you worked out, run resolve --all. But the interface here is not very good.