Re: Ignore Whitespace bug?
From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-04-12 09:31:19 CEST
On 4/2/07, Thomas Börkel <tbo@ap-ag.com> wrote:
> I am merging a file with 2 changes into my working copy. The first one
Of course it's lost. If you *ignore* whitespaces, you shouldn't be
> I thought that ignore whitespaces only ignores whitespaces at the
Where did you get that from?
> And if not, it is still fatal that this change gets lost during conflict
No, it's not. You've told TMerge to ignore whitespace changes, so it
Stefan
-- ___ oo // \\ "De Chelonian Mobile" (_,\/ \_/ \ TortoiseSVN \ \_/_\_/> The coolest Interface to (Sub)Version Control /_/ \_\ http://tortoisesvn.net --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org For additional commands, e-mail: dev-help@tortoisesvn.tigris.orgReceived on Thu Apr 12 09:31:50 2007 |
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.