Once in a while (rarely though), somehow OneDrive fails to sync properly and a user is left with online cloud version of file ExcelA.xlsx and local edits (saved into file ExcelA-unsyncedEdits.xlsx that may have 2 hours worth of edits that are now impossible to merge using the default mechanism.
Is there a way to force OneDrive to merge these two and preserving everything around ExcelA.xlsx (e.g., link used by others, version history, etc.)