RE: Never merge?

> 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?

The problem is that this is XML that has generated values that I as a user am depending on.
I have no clue about the data in this XML so I expect the best for me to be having my own version as
the correct one in a conflict. Marking the file as resolved: does it lead me to having my own file as
the right one and that no conflict is there? Doesn't resolve on a conflicting file lead to the file
being with mine-info in the file?

Allowing the user to edit this xml will make the user not have accurate info in his file.
In this case the user wants to have the latest version but if he/she forgot to update, they should
handle their own file as the correct one (never merge).

But I think the best way would be to mark this file as a binary file, that case it will not be merged right?

thanks,
Ignacio

-----Original Message-----
From: Stein Somers [mailto:ssomers_at_opnet.com]
Sent: Freitag, 25. September 2009 13:35
To: users_at_subversion.tigris.org
Subject: 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].
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2400207
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].