search

FlaShG / GitMerge-for-Unity

Unity plugin for merging sceneand prefabs files when using git.
GNU General Public License v2.0
201 stars 27 forks source link

Modify Multiple Properties at Once #42

Open randomPoison opened 9 years ago

randomPoison commented 9 years ago

It would be great if there were a way to select multiple properties in the merge window and choose my version or their version for all of them. It quickly becomes annoying when a there are a bunch of changes that you know aren't conflicts (in my case, another person rearranged a bunch of the level, so I know I can just accept their version for all the moved objects), but you still have to merge each one individually.

FlaShG commented 9 years ago

Selecting each property by clicking it once and then apply a version to them all makes you end up clicking once more even. So i guess we'd need some creative ui witchery to implement this. What about a "ours" and a "theirs" button for every GameObject? I also thought about a way to apply actions to objects based on space, e.g. create an area and apply "ours" or "theirs" for all GameObjects contained.

randomPoison commented 9 years ago

Woops, I should clarify that the problem comes from having to expand the properties for each object before being able to merge the property, so you effectively need to click twice for every property if you have a bunch of objects with one property each.

Having a "merge all" button for each game object would be good because it would cut the amount of clicking in half. It would be nice to be able to shift click to select a whole range of game objects (the same way you would in a file browser), that way it would be really easy to do a mass edit.

FlaShG commented 9 years ago

1e47e7d89230e7abcec23e48b3df2341717252c6 and the following fix add those buttons.

To be honest, the shift-click thing doesn't seem very practical to me. Since the GameObjects are unordered in the tool window, having more than a handful of list items in a row that match in terms of a reason to use version x for all of them seems unlikely. Expecially when thinking of a three way merge.