https://github.com/FlaShG/GitMerge-for-Unity

Unity plugin for merging sceneand prefabs files when using git.
https://github.com/FlaShG/GitMerge-for-Unity

unity unity3d

Last synced: 2 months ago
JSON representation

Unity plugin for merging sceneand prefabs files when using git.

• Host: GitHub
• URL: https://github.com/FlaShG/GitMerge-for-Unity
• Owner: FlaShG
• License: gpl-2.0
• Created: 2014-11-07T01:40:31.000Z (about 10 years ago)
• Default Branch: master
• Last Pushed: 2023-01-30T14:07:50.000Z (almost 2 years ago)
• Last Synced: 2024-08-03T05:15:57.479Z (5 months ago)
• Topics: unity, unity3d
• Language: C#
• Homepage:
• Size: 407 KB
• Stars: 197
• Watchers: 28
• Forks: 27
• Open Issues: 22
• Metadata Files:
  • Readme: README.md
  • Changelog: CHANGELOG.md
  • License: LICENSE.md

Awesome Lists containing this project

README

        
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.