Can someone explain to me how this is not considered to be a merge conflict? The column was renamed both in the trunk and in the branch. Should it not give a merge conflict since it was renamed in both?
Trunk version 1.22 → branch 1.0 created
Trunk v 1.23 column x renamed to xxt
Branch v 1.01 created
Branc v 1.01 column x renamed to xxbb
Renaming a column is currently considered no different from deleting a column and creating a new column.
The merge session considers the column X to be deleted in both branch and trunk and sees a new column XXT in the trunk and XXBB in the branch.
There is currently no proper way to indicate that XXT and XXBB are logically the same column. We do have options to resolve this on the backlog.
Enter your E-mail address. We'll send you an e-mail with instructions to reset your password.