Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
I often encounter conflicts when doing a Subversion merge, for example:
svn merge -r10347:HEAD ^/branches/header-and-navbar
I know about --dry-run, and I do that to get a preview.
But then after running it for real, if I want to choose “postpone” for each conflict, that can take a long time for a lot of files.
How can I tell Subversion ahead of time not to ask me for each file?
svn merge -hlists all the options, and the one you’re looking for isor