What causes a .meta file merge conflict in Git for a Unity project?

Two branches edited the same asset's import settings or both imported a new asset, so Git produced conflict markers inside the YAML .meta and Unity refuses to import it until they are resolved.

How do I catch this when it only happens for some players?

Capture it automatically from the player's device with the full stack trace, the device and OS, the build, and a breadcrumb trail of what they did. That turns a vague complaint into a specific, reproducible issue you can fix without owning the hardware it happens on.

How to Fix .meta File Merge Conflicts in Git for a Unity Project

Quick answer: Resolve the conflict by keeping a single valid GUID and merging the import-settings blocks by hand, then let Unity reimport; set a YAML merge tool and a .gitattributes entry to reduce future conflicts.

Git reports a conflict in a .meta file after a merge. Unity then logs that the meta is corrupt and may regenerate a GUID, which silently breaks references across the project.

How to fix it

1. Preserve one GUID

Open the conflicted .meta and keep exactly one guid: value (prefer the one already in main so existing references survive). Delete the other side and the conflict markers.

2. Merge import settings carefully

For the remaining settings under TextureImporter or similar, hand-merge the changed keys rather than picking one whole side, so neither developer's import tweak is lost.

3. Prevent recurrences

Add Unity's YAML smart merge to .gitattributes with *.meta merge=unityyamlmerge and configure the tool in .git/config so future meta conflicts merge cleanly.

Catching the ones you can't reproduce

The hardest version of this to fix is the one you can't reproduce — it only happens on a player's hardware, OS, driver, or save state, under conditions that simply aren't present on your machine. A report that says “it crashed” or “it froze” gives you nothing to act on, so the bug survives release after release while quietly costing you players.

Automatic error capture closes that gap. Each failure arrives with its full stack trace, the device and OS, the build number, and a breadcrumb trail of what the player did right before it broke, so even a failure you have never seen becomes a specific, reproducible issue. Fold identical failures into one signature ranked by how many players each hits, and your worklist sorts itself worst-first instead of arriving as a stream of vague complaints.

This is where a tool like Bugnet earns its place. Its SDK captures every error automatically with the full stack trace plus device, OS, memory, build, and game-state context, folds duplicates into one grouped issue with an occurrence count, and ties each to the build it first appeared on — so you fix the problem that hurts the most players first and confirm it is gone when its signature disappears from the next release.

Reproduce it once with full context and the fix writes itself. The hunt is the expensive part.