Search Unity

  1. Welcome to the Unity Forums! Please take the time to read our Code of Conduct to familiarize yourself with the forum rules and how to post constructively.
  2. We have updated the language to the Editor Terms based on feedback from our employees and community. Learn more.
    Dismiss Notice
  3. Join us on November 16th, 2023, between 1 pm and 9 pm CET for Ask the Experts Online on Discord and on Unity Discussions.
    Dismiss Notice

Question AddressableAssetSettings cannot be merged in Plastic SCM?

Discussion in 'Addressables' started by garv3, Jan 27, 2023.

  1. garv3

    garv3

    Joined:
    Dec 30, 2012
    Posts:
    32
    Hey there,

    we are working on a project using Addressables and use Plastic SCM for version control.

    But there seems to be a major problem with this combination:
    Whenever one makes changes to the Addressables (adding assets, editing groups or labels...) the currentHash property of the AddressableAssetSettings is recumputed and changed.
    Now if more than one person makes changed to the Addressables there will be a conflict when merging because the hash has been changed by all of them which cannot be merged.

    The only possible solution on our end would be that not more than one person works on addressable assets at the same time but this is completely impossible because most asset folders in our project are marked as addressable and we use scripts to create assets programmatically. Nearly every time when anyone works on the project assets will be created, moved or deleted.

    Is there any good approach to get around these merge conflicts?

    Thanks in advance
     
    apkdev likes this.
  2. garv3

    garv3

    Joined:
    Dec 30, 2012
    Posts:
    32
    Oh, nothing? Are we the only team facing this problem?
     
    apkdev likes this.
  3. apkdev

    apkdev

    Joined:
    Dec 12, 2015
    Posts:
    263
    Obviously, the recommended workflow of managing addressables is a bit of a joke. Hope your mouse button switches are rated for a couple billion clicks. Maybe keep some spares nearby just in case.

    I personally use a script similar to https://github.com/favoyang/unity-addressable-importer, except much simpler and with hardcoded paths/rules. This way the addressable groups are automatically updated and can be easily regenerated from scratch. Not sure if it's a good solution because addressables in my project are falling apart anyway.