09-06-2016, 05:13 AM
(09-06-2016, 04:05 AM)DrMasik Wrote: Yes, but, sometimes, it is can not do merge automaticaly.
But having everything in separate files doesn't mean you suddenly don't get merge conflicts anymore, just less.
What is the problem with it anyway? Fix them, commit them, merge. It's not like fixing merge conflicts take a lot of time
Anyways good job with the plugin! I have no use for it myself, but it's good having more plugins to choose from!