GitMerge-for-Unity
GitMerge-for-Unity copied to clipboard
FlaShG
Unity plugin for merging sceneand prefabs files when using git.
* Update the skin to better work with personal skin and custom editor colors. * Try to use default editor styles. * Improve the layout. * Mainly implement a flexible...
Investigate what needs to be done to properly support those new concepts, then implement that.
When I try to merge a scene, I get a bunch of errors that look like the following: ``` Can't destroy Transform component of 'polySurface10'. If you want to destroy...
Update the github.io pages to reflect recent changes. * There's no need for that `.gitattributes` config anymore. * There's no need for binary serialization mode in the editor anymore.
After merging and conflicts are set I click the button "Start merging the scene" and get this error: IOException: Assets/ContentPlayerFiles/my scenes/StarterLoader--OURS.unity already exists System.IO.File.Copy (System.String sourceFileName, System.String destFileName, Boolean overwrite)...
when you start merging - opening new scene (also on merge prefab), but when you change scene before finish merge (fix or abort) and then click 'abort merge' or smth....
Invalid view child name when object (or them childs) have long path: 
when added prefab to merge with some components  throw this:  many times (~226): Actor::updateMassFromShapes: Compute mesh inertia tensor failed for one of the actor's mesh shapes! Please change...
Also: Merging a GameObject that has been deleted on one of the branches. "A added a Component, B deleted the whole GameObject." GameObjects probably need to be displayed in a...