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

Re: [TSVN] bug: when merging back newly added binary files, a conflict is issued

From: Simon Large <simon_at_skirridsystems.co.uk>
Date: 2005-07-12 15:26:12 CEST

Leonard Ritter wrote:
> we've been running into some problems with tortoiseSVN recently where binary
> files such as images that have been added to a subbranch create a conflict
> when the branch is merged back into the trunk.
[snip]

You asked the exact same question on 7th July and received an answer
from Stefan within 2 hours in which you were asked to check the results
using the command line client. You *did* try with the CLI, didn't you?

Simon

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Jul 12 15:25:33 2005

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