[Notes for minor issues (iii)] SVN tree conflict (tree conflict). Solution to File Failure

LegendTree conflicts in SVN are caused by different developers deleting files and moving files.

 

What we encounter is:

Developer B moved several files in the project and then submitted them. Developer l updates the project to the latest version.

After obtaining the moved file, it is displayed that the file has been modified. At this time,Cannot be submitted or restored. "tree conflict" is displayed ".

 

Solution:

On the submit page above, right-click a conflicting project and choose = & gt; subversion = & gt; R.Esolve (like this word) = use the Workspace Copy (similar, but not clearly remembered)

Then, click "OK" to submit the job normally.