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

Merging branches with identical binary files

From: Dominik Ruf <dominikruf_at_googlemail.com>
Date: Wed, 4 Jun 2008 16:30:22 +0200


I have just tried to merge 2 branches with some identical binary files.
Subversion says that there is a conflict between each of the 2 files.
This forces me to check if they are really identical which would be
unnecessary if subversion would realize that they are equal.

Is there a cogent reason why these files are treated as conflicts.

To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-06-04 16:30:48 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.