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

Issue with merge

From: Henry Piņeros <hapinerosa_at_gmail.com>
Date: Thu, 16 Jun 2011 14:27:52 -0500

Hi all.

I do a merge between two folders (source) (Ep. svn merge
http:xxx/src http:xxx/src) and it works very well (It shows a File1.java
with a conflcit -C)

Whe and I try do it but directly in this file, the merges doesn't work (Ep.
svn merge http:xxx/src/File1.java http:xxx/src/File1.java ).. It doesn't
show the conflict, it show -U File1.java!!

Help me!!

Sorry for my englsih!!!!

-- 
Estudiante de Ingenieria de Sistemas e Informatica
             Univesidad Nacional de Colombia
                         Sede Medellin
                                2011
Received on 2011-06-16 21:57:32 CEST

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