Subversion - Always resolve conflicts using mine for a set of files

Question

We\'ve got a sizable chunk of auto-generated code that we keep around in subversion. Sometimes I\'m working on a piece of the generator while another coworker is working on

Answer 1

You should probably avoid having generated files in SVN in the first place - as you can tell, this is a source of conflicts. Better to have them be ignored, and build them as part of the build.

But as to your question, you should be able to use the --accept mine-full option to svn update, which makes conflicts automatically resolve to mine. See the Subversion manual and man pages for more details.

Answer 2

That should be

svn resolve --accept [postpone|base|mine-full|theirs-full|edit|launch]

No?

Answer 3

svn update --accept [postpone|base|mine-full|theirs-full|edit|launch]