Re: Never merge?

Ignacio Barrientos wrote:
> I was wondering if there is a good way of handling files that are text
> files but automatically generated

The obvious answer is: don't version them. But I assume this generation takes
much time or effort, so you really want to have the file versioned.

> and where you do not want to handle conflicts if they were to be found?

But surely you still need to handle the conflict by regenerating the file?
Since that takes a lot of time or effort, why bother that you first have to
mark the conflict as resolved?

-- 
Stein
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2400197
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].