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

[Subclipse-users] How I merge and join 2 files?

From: Larissa Rocha Soares <lari.rsoares_at_gmail.com>
Date: Thu, 9 Sep 2010 12:39:01 -0700 (PDT)

Hello,
I need to merge 2 files, a trunk and a branch. I had used the function "merge" of the SVNClient, but it's not works how I need. I will show the cenario for you:

tunk:
      int a
      int b

branch1:
      int a

      int c

I need the file resulting from this merge operation is:
      int a
      int b
      int c
So, how could I do that? Does anyone know? Please!

------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=2657294

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2010-09-09 21:39:38 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.