SVN Merge - Completely "theirs full" - Branch to trunk

svn svn-merge svn-merge-reintegrate
Deepak Singhal picture Deepak Singhal · Jan 22, 2014 · Viewed 8.5k times · Source

I want to merge my branch to trunk and basically want to over-write all the code in branch to the trunk..While receiving conflicts I kept doing "theirs full" for all the conflict; but still at the end it shows so many conflicts.

All I want is over-write complete branch on my trunk. Surely a possible way is to branch out from my branch but then my trunk becomes useless !

Also, while doing svn merge can I give an option so that for all conflicts it takes a particular value ( in this case Full-theirs ) and I dont have to type it always for all the conflicts.

Answer

Ben Reser picture Ben Reser · Jan 22, 2014

Pass --accept=theirs-full to the svn merge command.

Related questions

SVN Merge conflict during commit

Eclipse + Subversive plugin On commiting a directory which is out of sync with the SVN a message pops up: Merge conflict during commit svn: Commit failed (details follow): svn: File or directory '.' is out of date; try updating …

Read More
SVN strategy using branches, and merging changes from trunk into branch

So long time user of SVN, but fairly inexperienced in branching / tagging, and when I have I suspect I'm not really using it correctly or to its full potential. I have my trunk which I work on adding new features …

Read More
Svn merging and automatically resolving conflicts

I am new to svn and need to do a lot of merging from trunk to a branch we are working from. This is the sequence of svn commmands I take to merge svn up svn mergeinfo --show-revs eligible branch …

Read More