Cache server and branching

Unity Engine
1

We’re looking into getting a team license so we can make use of the cache server.

Reading the documentation, it’s not really clear to me how it handles branches. If everything is based on filename and hash of the file, won’t branches create conflicts when file contents change in the branch (and the file name remains the same)?

We use branches quite extensively in our source control system. Anyone have any experience with this?

Thanks.

2

We’ve been using it with branching for over a year. It basically just creates a cache for EACH revision of a file. So when you merge, if the merging creates a new revision, it will create the cache for that particular revision.

It’s based on the .meta file UID I believe.