[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Tree conflict problem when merging two branches

From: André Roy <andre_at_dsa-ltd.ca>
Date: Fri, 12 Aug 2016 13:00:04 -0700

Hi all,

First time posting.

-Create a repository (trunk/tags/branches),
-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.

Am I doing something wrong?

Thanks,

André
Received on 2016-08-12 22:00:30 CEST

This is an archived mail posted to the Subversion Users mailing list.