Inicio Explorar Ayuda
Registro Iniciar sesión
Terra
/
new-git
2
0
Fork 0
Archivos Incidencias 0 Pull Requests 0 Wiki
Árbol: e1f710d717
Ramas Etiquetas
new-git
/
Assets
/
GitMerge
Syed zainul abedin f07474f921 Updated conflict watcher hace 4 meses
..
Editor f07474f921 Updated conflict watcher hace 4 meses
CHANGELOG.md ad978c4e3d Added base git merge hace 4 meses
CHANGELOG.md.meta ad978c4e3d Added base git merge hace 4 meses
Editor.meta ad978c4e3d Added base git merge hace 4 meses
LICENSE.md ad978c4e3d Added base git merge hace 4 meses
LICENSE.md.meta ad978c4e3d Added base git merge hace 4 meses
README.md ad978c4e3d Added base git merge hace 4 meses
README.md.meta ad978c4e3d Added base git merge hace 4 meses
package.json ad978c4e3d Added base git merge hace 4 meses
package.json.meta ad978c4e3d Added base git merge hace 4 meses

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.