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
