[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: Simon Large <simon.tortoisesvn_at_gmail.com>
Date: Tue, 29 Oct 2013 10:05:06 +0000

On 29 October 2013 09:37, Gergely Toth <gergelyk3_at_gmail.com> wrote:

> Hello,
> 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.
> What cause the errors?
> Unfortunately I must not upgrade the clients till not solve that issue.

You are not explaining this very clearly.

What do you mean by "without conflicts"? Were you expecting a conflict?
What is the error you are seeing?
How are you doing the merge - what URLs do you use? What is the result?



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-10-29 11:05:16 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.