Velvet Star Monitor

Standout celebrity highlights with iconic style.

updates

Manage conflicts with svn update command line

Writer Matthew Martinez

I'm implementing a batch program that updates recursively some SVN projects in a directory. I work with Tortoise SVN.

All works fine expect one case: when I have conflicts during the update, the command line stops and prompts this message:

Conflict discovered in 'XXXXXXX.XX'.
Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: p

I would like to know if it's possible by a command parameter to "force" the "p" choice everytime without stopping my command.

Thanks in advance for your answer.

1 Answer

Yes, it is possible. Try following command:

svn update --accept postpone

Alternatively try this command:

svn update --non-interactive
2

Your Answer

Sign up or log in

Sign up using Google Sign up using Facebook Sign up using Email and Password

Post as a guest

By clicking “Post Your Answer”, you agree to our terms of service, privacy policy and cookie policy