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

Re: Issue with merge

From: Stefan Sperling <stsp_at_elego.de>
Date: Fri, 17 Jun 2011 09:32:25 +0200

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**://example-test-project.googlecode.com/svn/trunk/src/*
> *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 https://example-test-project.googlecode.com/svn/branches/branchPrueba/

> 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.
Thanks!
Received on 2011-06-17 09:33:23 CEST

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