Reason for conflict?

Hi,
   I've been happily using Subversion now for over 3 years.

My server is Win2K Subversion 1.1.4 version and my client is WinXP
Subversion 1.2.0 version.

About two months ago I created a branch of our trunk code and started
making some changes on the branch.

For several weeks I did weekly merges of trunk into the branch with no
problems.

I finished up most of the work on the branch about a month ago and haven't
made any more changes to it since then.

Today I am working on merging in the changes to the trunk since the last
merge and I'm getting some conflicts and I don't understand why. The
conflicts are not on code or files that I've changed on the branch.

Any ideas?

What am I missing?

Thanks!

--
David Wayne Summers        "Linux: Because reboots are for hardware upgrades!"
david_at_summersoft.fay.ar.us PGP Key: http://summersoft.fay.ar.us/~david/pgp.txt
PGP Key fingerprint =  0B44 B118 85CC F4EC 7021  1ED4 1516 5B78 E320 2001
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org