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

Re: Modification Issue: committing required features...

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Tue, 28 Oct 2008 19:46:19 +0100

Thomas Lehmann wrote:
> Hi,
>
> Following problem:
> I have merged a branch into the main branch but the build fails,
> because I have used a method of one class not available in the
> main line.
>
> How do I merge this issue?

Do a normal merge, then edit the merged files which are wrong manually.

Stefan 

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net

Received on 2008-10-28 19:46:38 CET

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

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