Sync conflicts are never fun, but from personal experience programs that attempt to auto-resolve them aren’t exactly letting the user in on what’s going on.
The best way to make that work in that case would be to explicitly inform the user when unignoring of the conflict and ask which to keep (showing metadata etc). A quick “retain other version” would help if the user was unsure.