Hacker News new | ask | show | jobs
by Tiktaalik 4602 days ago
They are technically mergeable because they're text based, but they're not super easy to comprehend. I've found that .unity scene files seem to develop dramatic changes between check-ins that make it difficult to isolate problems (ie. giant blocks of text removed from one part of the file, then put in another part of the file untouched).

In general I feel like the best practice is to touch these .unity scenes as little as possible, and spend most of your time iterating on prefab files, which are easier to read.

Haven't tried git with unity so I dunno if there are any special case issues there.