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

RE: [TSVN] More Bug Reports

From: Josha Foust <jfoust_at_mankowindows.com>
Date: 2004-12-10 22:43:50 CET

-----Original Message-----
From: SteveKing [mailto:steveking@gmx.ch]
Sent: Friday, December 10, 2004 3:20 PM
To: dev@tortoisesvn.tigris.org
Subject: Re: [TSVN] More Bug Reports

> > I was messing around with the "Use text block from "theirs" before
> > "yours""
> > in the merge and such and it seems to have broken the previous and next
> > conflict buttons to get to that line.
> If you click on either of those context menus, the conflict is gone!
> Think about it: you resolve that conflict by choosing which of the
> conflicting lines you want to use. That's why the "next conflict"
> doesn't stop there anymore.

How is that different from the first two context menu choices which don't
cause the "next conflict" button to skip over the lines when applied?

Josha Foust

To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Dec 10 22:44:31 2004

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

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