[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Never merge?

From: Ignacio Barrientos <ibarrien_at_adobe.com>
Date: Fri, 25 Sep 2009 12:12:25 +0100


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.



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

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.