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.
