Depending on how far off your customization is from the ecommerce app you may be better off following this approach:
http://ofbizwiki.go-integral.com/Wiki.jsp?page=FAQ28 If you follow the difference approach you won't need to maintain files that you haven't modified. If you copy the entire ecommerce app and modify that copy, you won't benefit from any advancements in the ecommerce application. --- Wojciech Gdela <[EMAIL PROTECTED]> wrote: > Hello, > > Currently I'm customizing layout in my OFBiz > application. At the > beginning followed the best practise with CVS > Branching/Merging > described in > http://incubator.apache.org/ofbiz/best-practices.html#Differences. > Then > I reworked many *.ftl files to change layout, > colors, etc - a whole new > look and feel. Now when I try to merge new version > of OFBiz CVS shows > many conflicts in those files. Resolving them > manualy is a nightmare. > > I wonder if anyone has a better way to do complex > layout customization? > > -- > Best regards, > Wojciech Gdela. > >
