There are a picture of my issue!!!
On Fri, Jun 17, 2011 at 2:32 AM, Stefan Sperling <stsp_at_elego.de> wrote:
> On Thu, Jun 16, 2011 at 10:21:49PM -0500, Henry Piñeros wrote:
> > 7. Again, I do a checkout from trunk (C:/Trunk).
> > 8. svn merge *https**://
> > *https**://
> > example-test-project.googlecode.com/svn/branches/branchPrueba/src/*
> I think you should try to use this syntax instead:
> cd c:\trunk
> svn merge --reintegrate
> > C Hola1.java
> > … Shows a message to resolve conflict between fonts
> > Tomorrow, I going to post here!! (with images)
> No, please do not post images to this list.
> You may link to them if you have them somewhere on the web, but please
> do not attach them. Mail you send to this list goes to a huge number
> of mail boxes so please try to use only text to keep the messages small.
Estudiante de Ingenieria de Sistemas e Informatica
Univesidad Nacional de Colombia
Received on 2011-06-17 17:35:33 CEST