[SVN-4663] Tree conflict problem when merging two branches

• Type: Bug
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Affects Version/s: 1.9.4, 1.9.5
• Fix Version/s: 1.10.0

Environment

Windows, TortoiseSVN, Command line

• Assignee: Unassigned
• Reporter: André Roy
• Created: 15/Dec/16 20:31
• Updated: 10/Feb/17 13:17
• Resolved: 10/Feb/17 13:17

Description

Bug confirmed by Branko Čibej <[e-mail]> on users mailing list.

Quick verbal description of how to recreate the issue:

-Create a repository (with trunk/tags/branches structure),
-Checkout /trunk,
-Create branch1 in /branches/branch1, and checkout.
-Create and checkout branch2.
-Create file.txt in Trunk + add + commit.
-Merge trunk changes into branch1 and commit.
-Merge trunk changes into branch2 and commit.

The problem:
-Merge branch1 changes into branch2, gives me a Tree conflict with file.txt.