Search Unity

[Solved] Progressive Lightmapping and Collaborate

Discussion in 'Unity Collaborate' started by Vern_Shurtz, Aug 13, 2018.

  1. Vern_Shurtz

    Vern_Shurtz

    Joined:
    Mar 6, 2009
    Posts:
    264
    I switched my project over to Progressive Lightmaping from Enlighten and submitted the project to Collaborate. Now when someone pulls the commit they get an "error resolving conflict" for all of the Progressive lightmap files. What is the best way to handle Progressive Lightmaps and Collaborate?
     
  2. Vern_Shurtz

    Vern_Shurtz

    Joined:
    Mar 6, 2009
    Posts:
    264
    Update: I selected see all in project and selected all of the files and chose theirs. I then reloaded the scene at it appears that the new lightmaps are being used.
     
    ryanc-unity likes this.
unityunity