André Roy created SVN-4663:
------------------------------
Summary: Tree conflict problem when merging two branches
Key: SVN-4663
URL: https://issues.apache.org/jira/browse/SVN-4663
Project: Subversion
Issue Type: Bug
Affects Versions: 1.9.5, 1.9.4
Environment: Windows, TortoiseSVN, Command line
Reporter: André Roy
Bug confirmed by Branko Čibej <[email protected]> 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.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
