How do I make svn update prompt to resolve conflicts?

Question

I always use svn update from the command line in order to update my svn repo. However, we have a few files which always conflict, but which I generally always want to resolve immediately to mine. Until recently, whenever I ran svn update it would prompt me in-line for file resolutions. However, for some unknown reason it stopped recently, forcing me to resolve things in an extra separate step.

How do I re-enable the behavior where it will prompt in-line from the command line?

Answer 1

According to SVN documentation here, some options can be stored in the registry or in INI files.

Please check there, especially for the "interactive-conflicts" parameter as the the sample below:

#interactive-conflicts"="yes"

You must remove the # character to activate the option.

You will have to find the exact place where your configuration is written.

Answer 2

Check --accept option: it can be 'postpone' now, but 'edit'|'launch' before