Resolve resource update conflicts

QBCore resources evolve by commit. Treat an update as a source merge and integration test, not a folder replacement or an assumed framework release upgrade.

Evidence to collect

• Current and target commit SHA for every updated repository
• git diff for local edits and a list of dependent resources
• Config, SQL, manifest, export, and event changes between the two commits
• A production backup and staging smoke-test record

Safe diagnostic

1. Create a branch from the deployed commit and commit local changes separately.
2. Review upstream changes commit-by-commit, then merge or rebase on the branch.
3. Resolve config semantics manually; do not accept either side of every conflict wholesale.
4. Apply reviewed schema changes to staging and test dependencies before production.

Fix

Deploy a recorded set of compatible commits with local patches reapplied as auditable commits. Update one dependency group at a time and keep feature-specific smoke tests with the deployment record.

Rollback

Redeploy the previous commit set and restore the matching database backup if schema/data changed. Do not mix an old resource with a new unverified schema.

Sources

• qb-core commit history 
• Public Cfx.re update-conflict pattern