I am traveling and had to reset my Firefox account password *without* creating a recovery key first. This new laptop did not get any of the bookmarks and credentials. After reading through the recovery key info, I now see that it is supposed to happen that way. When I did this, my office PC (which has all of my bookmarks and credential history) was automatically logged out of Firefox sync. The good news is that it still has an intact offline copy of my bookmarks and credentials. If I log that machine back into Firefox sync with the new password, is the online "empty" repository going to overwrite that machine and wipe out the bookmarks and credentials? If so, is there a way to set that machine's local DB to "win" and overwrite what is online?

Thanks, Jim