Quick answer: Godot 4 reporting UID collision after merging two team branches? Two .uid files claim the same ID - delete one and regenerate via the import scan.

Merge from main brings in a texture; project warns resource UID collision: uid://abc123 references multiple paths.

Delete the duplicate .uid

The conflict is in the .uid files next to each asset. Pick the canonical one, delete the other. On next editor scan, Godot regenerates the missing UID.

Don't merge .uid files in git

Add a .gitattributes rule: *.uid merge=ours. The local UID always wins; collisions become impossible at the VCS layer.

Verify with the project log

Editor > Open Project Settings > Editor > Log. UID warnings appear here; if empty after the fix, the collision is resolved.

“UIDs are unique identifiers. 'Unique' is the part teams break first.”

Commit .uid files but treat them as merge-immutable. Resolution is always 'keep one, regenerate the other'.