Asset Server and Lightmapping causing unnecessary server updates

This isn't really a big issue, but it's getting pretty annoying and costing me dev time on a regular basis. I am using the Unity Asset Server for version control on my current project. Almost everything works great; I honestly think the Asset Server is priceless and has saved my behind on many occasions.

The problem is that every time I bake a lightmap, I need to "Update" my project before committing, which is very weird because I haven't committed anything from anywhere. But it never fails.. bake a lightmap, and I have to update and ignore server changes before committing my changes.

Has anyone else run into this problem? On a related note, when I bake my scene of 14+ terrains, I always need to go into the map settings and change atlases for each object; all the maps are created properly, but are assigned to the wrong terrain. It doesn't matter if I manually set atlas maps for each terrain before the bake, the system does what it wants and assigns lightmaps as though it were intoxicated...

Again, this isn't a HUGE problem, but it's costing me a lot of dev time since I constantly need to go and make these changes over and over again, and I'm baking lightmaps constantly. Any ideas?

PS. I have tried both baking the entire scene and selecting a few terrains and using "Bake Selected" instead, both have the same result. I can live with having to reassign lightmaps manually, but I know one wrong move with the Asset Server Update/Commit system during a late-night gamedev jam could cause me a whole world of problems.