search

FlaShG / GitMerge-for-Unity

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

Use a page view for conflicts #60

Closed Begounet closed 4 years ago

Begounet commented 4 years ago

I've got a case where there were so much conflicts (9343) that my editor froze, so I set a kind of "page" system to display only a limited number of conflict. Well, in any case, it is too much for me to fix theses conflicts manually but at least, it doesn't explode haha. The visual is not really amazing but I suppose it is ok. Also, the system can be reused easily if necessary.

Also, it is important to note that filtered mergeActions are now cached. Otherwise, it would have been heavy to get a list of elements filtered, count the number of elements (required to determine the number of pages to display) and then make the view drawing for each frame.

Begounet commented 4 years ago

Here is an image of the page view

image