Can't diff/merge two Unity scenes

Unity Services
,
1

Hi there,

I’m usually getting this error when trying to merge a changeset into another branch:

“The files have too many differences, there aren’t enough resources to complete the operation. Try to set a different comparison method to reduce the number of differences”.

The issue comes when trying to merge a .unity file with a game scene. I’ve read about the 32k differences per operation, both changesets are a few days apart but I don’t think they really differ that much…

Anyway, I’ve tried to change the comparison method to “Ignore EOLs and whitespaces”, and also tried to set WinMerge as merge tool instead of UnityYAMLMerge, but the results were the same.

There is no much more info out there about this issue, so what else can I do to solve this?

Thanks!

2

SOLVED.

This worked for me:

In Preferences->Merge tools, I had to split the .prefab;.unity entry into two separate rules, and put both on the first positions, just before de $text and $binary rules.

I guess the merge tool it was using by default was the one assigned to $text or $binary, instead of UnityYAMLMerge.