Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

How can I preemptively postpone svn merge conflicts?

Tags:

merge

svn

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?

like image 944
Ryan Avatar asked Jul 12 '12 21:07

Ryan


1 Answers

svn merge -h lists all the options, and the one you're looking for is

svn merge --accept postpone

or

svn merge --accept p
like image 142
JB Nizet Avatar answered Nov 08 '22 21:11

JB Nizet