Merge Tool for Scene Files

1. Changes on scene file on feature

Alt text

2. Changes on scene file on master

Alt text

3. Try to merge feature in master

Alt text Alt text

4. Switch to feature

Alt text

5. Open Tools → GitinityUI

Alt text

6. Select target and feature branch, then press START

Alt text

Configure path to git-bash.exe if needed.

7. Automatic switch to master

Alt text

8. Drag and drop prefabs from Assets/DiffObjects_as_Prefabs

Alt text

9. Result in commits:

Alt text