We'd like to use CVS with projects being developed with Dreamweaver (an HTML editor from Macromedia -- runs on Mac & Windows OS's). Our server is on Solaris, and developers use either WinCVS or MacCVS on their desktops. The salient point is that Dreamweaver has a notion of "templates" (which are text files that work fine under CVS) that are "applied" time and again to the HTML file set. Due to the way Dreamweaver writes it's code (long lines), and the nature of HTML, an excessive number of conflicts are generated (especially for an audience not used to hand editing files). It appears that something fairly "non-CVS" could be arranged with "watch on" and rcslock.pl, but I'm hoping someone has a more elegant solution to reducing the number of conflicts. Perhaps putting the templates in a vendor branch? Or some sort of fancy 3-way merge? I've just read about those features in Karl Fogel's book, but haven't fully grocked them yet.... Any and all suggestions welcomed, --Hal
