Re: many "conflicts" that are not really conflicts

Markus Dehmann wrote:
> 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

Did you remove "Id" from svn:keywords so the expansion is now marked as
a conflict?

Rainer

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Feb 21 16:57:43 2005