[
https://issues.apache.org/jira/browse/SVN-4881?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Rajagopal updated SVN-4881:
---------------------------
Priority: Critical (was: Major)
> Tree conflict problem when merging two branches
> -----------------------------------------------
>
> Key: SVN-4881
> URL: https://issues.apache.org/jira/browse/SVN-4881
> Project: Subversion
> Issue Type: Bug
> Affects Versions: 1.10.7
> Environment: Windows, Command line
> Reporter: Rajagopal
> Priority: Critical
> Attachments: repeat.bat
>
>
> 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
--
This message was sent by Atlassian Jira
(v8.20.1#820001)
