All geek questions in one place

SVN Rename folder in branch, conflict

I have a branch in which the folder has been renamed. Now I am trying to merge the changes with trunk into this branch, but the files changed in trunk are still under the original folder name, so svn throws a tree conflict. How can i solve this?

The folder has been renamed using svn rename.

+6
source share
1 answer

This is the case when a merge always gives a tree conflict for a complete merge. The shortcut to avoid this conflict and merge the code is that after merging the full trunk with this branch ... ignoring the tree conflict, merge the individual folders.

For instance:

/trunk /FolderA /FolderB /FolderC /branhes /Branch1 /FolderA /FolderB /Renamed Folder (Previously Folder C)
  • Merge /trunk with /branches/Branch1
  • Merge /trunk/FolderC with /branches/Branch1/Renamed Folder

Hurrah!!

+9
source

Source: https://habr.com/ru/post/891766/

More articles:


All Articles