Почетна Преглед Помоћ
Регистрација Пријавите се
Terra
/
new-git
2
0
Креирај огранак 0
Датотеке Дискусије 0 Захтеви за спајање 0 Вики
Дрво: 3d81b9a569
Гране Ознаке
new-git
/
Assets
/
GitMerge
sujith 2c9abdfeaf Sujith :) -> пре 1 месец
..
Editor 2c9abdfeaf Sujith :) -> пре 1 месец
CHANGELOG.md ad978c4e3d Added base git merge пре 1 месец
CHANGELOG.md.meta ad978c4e3d Added base git merge пре 1 месец
Editor.meta ad978c4e3d Added base git merge пре 1 месец
LICENSE.md ad978c4e3d Added base git merge пре 1 месец
LICENSE.md.meta ad978c4e3d Added base git merge пре 1 месец
README.md ad978c4e3d Added base git merge пре 1 месец
README.md.meta ad978c4e3d Added base git merge пре 1 месец
package.json ad978c4e3d Added base git merge пре 1 месец
package.json.meta ad978c4e3d Added base git merge пре 1 месец

README.md

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/

Current project state

After five long years, Unity suddenly fixed issue #17 for us. The project is now back to a state full of potential, but it has years of Unity updates to catch up to.

Currently working:

  • Merging scene files (although this needs to be refined and thoroughly tested).
  • Merging prefabs (but the newer prefab features, nesting and variants, are not explicitly supported yet. There needs to be testing, at least).

Currently in need of work:

Please check the v2.0 milestone for a list of important issues.