Can I resolve a tree conflict with the status of "missing" in SVN not manually?

Question

I merged the two branches and had some tree conflicts. Some directories and files that existed in one branch and did not exist in another were not created in the working copy after the merge and remain in the tree conflict. Can I tell TortoiseSVN to add files to a working copy and not add manually?

Answer 1

There should be a way in Turtle. But basically, if you need to specify this SVN (if you have a command line client)

  svn resolve --accept theirs-full -R BASE_DIR

-R: recursive resolve for directories
-accept theirs-full: accept the changed done is the branch where you are merging from

http://svnbook.red-bean.com/en/1.5/svn.ref.svn.c.resolve.html

Answer 2

, , , . .

Answer 3

; :

• . svn . . , : " ".
• . .

, , , .

Answer 4

.

• Revert
• SVN

Answer 5

.

Clean

Commit