I have two special files. One I would like never to be merged. The other I would like to only ever exist in trunk. Is there any mechanism to accomplish this?
If you care....The file I don't want to merge contains the version numbers for products built in that branch and the un-branchable file is a list of branches that I only want to have in trunk. Currently I do a merge --record-only for the former and live with the latter. JLM Jeremy Mordkoff Director, QA, IT & Release ZeeVee, Inc. One Monarch Drive | Littleton, MA 01460 Office: 978.467.1395 x233 | Fax: 978.467.1404 Mobile: 978-257-2183 j...@zeevee.com www.zeevee.com
