As I hoped for higher limits I created my scratch org as a "Partner Developer" org. But now I am unable to push into my QA and Packaging org as they miss certain fields:

sfdx-source/ns/main/default/objects/Account/fields/NameLocal.field-meta.xml Could not resolve standard field's name. (161:13) sfdx-source/ns/main/default/objects/Contact/fields/FirstNameLocal.field-meta.xml Could not resolve standard field's name. (162:13) sfdx-source/ns/main/default/objects/Contact/fields/LastNameLocal.field-meta.xml Could not resolve standard field's name. (188:13)

I thought "Easy, I just rebuild my scratch org as a regular Developer org and then retry. But No! Now I am not even able to push my source into a scratch org.

How can I solve this without manually removing all the Partner specific metadata from my sources? I don't actually use all the Partner stuff. I just accidentally created a dependency.

As I hoped for higher limits I created my scratch org as a "Partner Developer" org.

{
  "orgName":"myns",
  "edition":"Partner Developer",
  "features":[
    "CascadeDelete",
    "DebugApex",
    "AuthorApex",
    "Communities"
  ],
  "settings":{

    "orgPreferenceSettings":{
        "networksEnabled":true,
        "s1DesktopEnabled":true,
        "chatterEnabled":true,
        "translation": true
    }
  }
}

But now I am unable to push into my QA and Packaging org as they miss certain fields:

sfdx-source/ns/main/default/objects/Account/fields/NameLocal.field-meta.xml Could not resolve standard field's name. (161:13) sfdx-source/ns/main/default/objects/Contact/fields/FirstNameLocal.field-meta.xml Could not resolve standard field's name. (162:13) sfdx-source/ns/main/default/objects/Contact/fields/LastNameLocal.field-meta.xml Could not resolve standard field's name. (188:13)

I thought "Easy, I just rebuild my scratch org as a regular Developer org and then retry. But No! Now I am not even able to push my source into a scratch org.

How can I solve this without manually removing all the Partner specific metadata from my sources? I don't actually use all the Partner stuff. I just accidentally created a dependency.