Archived

This repository has been archived on 2025-04-11. You can view files and clone it, but cannot push or open issues or pull requests.

Alex Huddleston faf829348b Project started, GitMerge added.

2018-05-09 20:42:22 -05:00

GitMerge-for-Unity

A Unity plugin which allows you to merge scene and prefab files when using git. More information: http://flashg.github.io/GitMerge-for-Unity/

...and it will not do so until a small change in scene serialization will be reverted in Unity. Please vote for this here: http://feedback.unity3d.com/suggestions/re-add-local-identifiers-in-scene-file-for-prefab-instances

Current state of the project

You can merge both scenes and prefabs. Working with the scene hierarchy is currently being improved.

There are still a few bugs to work on. If the tool messes up something, remember to git reset --hard 😉