» Tue Nov 20, 2012 11:06 am
I think the above has been a bit of an issue for many modders. What other tools are you using?
Version control is not something I've ever used (never taken on an ambitious group project as my capacity to dedicate time is unpredictable due to university and work commitments).
I'll tell you now that this isn't exactly my area of expertise.
If I could make a suggestion, from what I've gleaned here and there, somewhat related to the topic. Make all your worldspace and terrain edits in the single esp (an obvious suggestion, I know. haha) and then convert this file to an esm. Wrye Bash has the feature copy to esm and I've used it myself to great success for other purposes.
This esm shall then be your first master and you will copy every other plugin into this file (rather than trying to merge your worldspace.esp into XYZ.esm). I understand this suggestion may have grave implications and depending on how you've merged up to this point (I hope you've kept extensive backups) you could potentially lose some progress. If this is the case I would recommend setting up some test plugins really quick and seeing how it goes as to whether this is necessary.
Please know that my advice has been conjecture, but I wish you the best of luck!