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

RE: Tortoise 1.8 not show difference when merge

From: Bob Archer <Bob.Archer_at_amsi.com>
Date: Tue, 29 Oct 2013 13:53:10 +0000

> Im using Tortoise 1.8 with windows 7. I do the followings
> 1. Create a branch in REpo browser
> 2. check out the branch
> 3. Make changes in the branch
> 4. commit.pressed F5 in repository browser. all thing is on the server.
> 5. check out the trunk
> 6. I would mergethe changed branch to the trunk with "Merge two different
> trees" but the tortoise merged the branch without conflicts.

I don't think a tree merge would be the correct thing to do here.. rather, merge a range of revisions.

> What cause the errors?

What errors.. you didn't list any errors?

> Unfortunately I must not upgrade the clients till not solve that issue.


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-10-29 14:53:26 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.