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

Merging two branches

From: Bogdan Cristea <cristeab_at_gmail.com>
Date: Wed, 22 Oct 2008 15:20:04 +0300

      I have a mixed c,c++ and java source files in two different branches. I
have done a checkout from one branch, then I have used svn merge
svn://other/branch, but when the svn client discovers a conflict between
different versions of the same file (for example a java file) the entire file
content is marked as different even if in reality only several lines differ.
      This issue is annoying when the file is large and one needs only to see
the lines where the two file versions differ. Is there a way to solve this

Bogdan Cristea
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-10-22 14:20:39 CEST

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

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