Never merge?

Hi,

I was wondering if there is a good way of handling files that are text files but automatically generated
and where you do not want to handle conflicts if they were to be found?
I.e. you would most likely want this file never to be merged.

By the way: I'm not looking for the revert, update and commit changes workflow when running into the conflict.

Thanks,
Ignacio

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2400187

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-25 13:14:01 CEST