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

RE: many "conflicts" that are not really conflicts

From: Dale Worley <dworley_at_pingtel.com>
Date: 2005-02-22 17:08:00 CET

> From: Markus Dehmann [mailto:markus.dehmann@gmail.com]
> I created a branch at revision 1685. I modified the branch a lot,
> created new files etc. Then, I wanted to merge it back to the trunk.
> But, it shows lots of ridiculous pseudo-conflicts, like:
> <<<<<<< .working
> # $Id: program.pl 1685 2005-01-11 05:00:19Z markus $
> =======
> # $Id: program.pl 1685 2005-01-11 05:00:19Z markus $
> >>>>>>> .merge-right.r1978
> What is that? The lines are exactly the same. Why is it showing a
> conflict? I can't believe I have to edit all these files by hand now.

When I get things like this, and check them out carefully, I discover that
the whitespace on the lines is not the same. In your case, you are using a
keyword, and it seems to me that it is possible that the two branches have
slightly different versions of the keyword, but they look the same after the
substitution has been done.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Feb 22 17:15:21 2005

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.