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

• Type: Bug
• Status: Open
• Priority: Critical
• Resolution: Unresolved
• Affects Version/s: 1.10.7

Environment

Windows, Command line

• Assignee: Unassigned
• Reporter: Rajagopal
• Created: 04/Jan/22 06:57
• Updated: 04/Jan/22 09:13

Description

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.

 

Duplicate of svn-4633