Syed zainul abedin
7e9a34644b
Updated conflict watcher
|
1 개월 전 | |
|---|---|---|
| .. | ||
| Editor | 1 개월 전 | |
| CHANGELOG.md | 1 개월 전 | |
| CHANGELOG.md.meta | 1 개월 전 | |
| Editor.meta | 1 개월 전 | |
| LICENSE.md | 1 개월 전 | |
| LICENSE.md.meta | 1 개월 전 | |
| README.md | 1 개월 전 | |
| README.md.meta | 1 개월 전 | |
| package.json | 1 개월 전 | |
| package.json.meta | 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.