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

Re: Merging two branches

From: Tyler Roscoe <tyler_at_cryptio.net>
Date: Wed, 22 Oct 2008 11:04:37 -0700

On Wed, Oct 22, 2008 at 03:20:04PM +0300, Bogdan Cristea wrote:
> 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
> issue?

Is it possible you are getting conflicts because of whitespace/line
endings issues? Do you have a mixed development environment (Windows +


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 20:05:11 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.