search

davemn / city-generator

Unity port of Carson Britt's (THREE.js) procedural city generator
Other
19 stars 6 forks source link

Version control for scenes / assets #2

Open davemn opened 7 years ago

davemn commented 7 years ago

Git works well for managing code, but .unity scene files, .prefab files, etc. often break when importing into a new Unity environment. Problem due to engine version differences, asset ID conflicts. Need to look at alternate ways to version non-code assets that won't break on re-import.

davemn commented 7 years ago

See:

  1. "Using External Version Controls Systems with Unity"
  2. "Smart Merge".

(1) is (hopefully) addressed in 8f9e213, where .meta files and the ProjectSettings directory were added to this repo.

(2) needs further exploration. Version control integration into the Unity editor is a Pro feature. I'd like to keep this repo accessible to hobbyists and professionals alike, so that's off the table. It comes down to managing conflicts. Need to use UnityYAMLMerge to resolve asset (.unity, .prefab) conflicts, but still use a textual diff for source code conflicts.

davemn commented 7 years ago

Text-based scene files are another option. Could be difficult to manually merge without corrupting the scene.