How can I preemptively postpone svn merge conflicts?
Question
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?
1 answers
solution1
16 ACCPTED 2012-07-12 22:00:48
svn merge -h lists all the options, and the one you're looking for is
svn merge --accept postpone
or
svn merge --accept p
The technical post webpages of this site follow the CC BY-SA 4.0 protocol. If you need to reprint, please indicate the site URL or the original address.Any question please contact:yoyou2525@163.com.
Related Question
svn merge with conflicts
SVN Update Postpone --> How to resolve?
How can I run updates in SVN without causing many conflicts
How can I resolve all SVN conflicts automatically? (Windows CLI)
How do i go about resolving this svn merge error : svn merge aborted abnormally. resolve conflicts and continue?
svn: using vim to merge conflicts
How to merge conflicts (file project.pbxproj) in Xcode use svn?
Removing new files generated during SVN merge and postpone
How do I detect SVN 1.7 conflicts before SVN update?
How conflicts are detected in SVN?
Related Tags