Guten Tag Mike Miller, am Freitag, 16. September 2011 um 18:23 schrieben Sie:
> Just looking for suggestions on how others handle situations like this? Isn't this a problem of your software architecture? If you have shareable code, which isn't shared, this is your problem in my opinion. Sounds like you should think of a plugin interface or something like that. Until then, your merges could be automated as it sounds that every change in your trunk to the common codebase must apply 1:1 to the customer branches as well. If this is not the case, live with your branches and try to get rid of the shareable code by redesigning your architecture. Mit freundlichen Grüßen, Thorsten Schöning -- Thorsten Schöning AM-SoFT IT-Systeme - Hameln | Potsdam | Leipzig Telefon: Potsdam: 0331-743881-0 E-Mail: tschoen...@am-soft.de Web: http://www.am-soft.de AM-SoFT GmbH IT-Systeme, Konsumhof 1-5, 14482 Potsdam Amtsgericht Potsdam HRB 21278 P, Geschäftsführer: Andreas Muchow
