Newbie question: merging causing conflicts that shouldn't be there

Hi Y'all,

I'm a newbie at subversion.

I have a project with a main branch and an experimental branch
(several people change the main branch, I'm the only one changing
the experimental branch). Every day (more or less), I merge the
main branch into the experimental branch so that they don't get
too far off track.

Today I got a conflict in a file that I had not changed. To be
specific:

Wednesday: merged the main branch (r10:20) into the experimental
branch working copy, committed the experimental branch (r21).
This included a change to Foo.cpp.

Wednesday-Friday: many changes to main branch including some
to Foo.cpp. Many changes to experimental branch, but NONE to
Foo.cpp. Commited the main branch (r30) and the experimental
branch (r31).

Friday: merge the main branch (r22:30) into the experimental branch
working copy. I get a conflict on Foo.cpp.

How do I get this conflict if I haven't changed Foo.cpp? Looking
at the conflict (which I resolved simply by using theirs) it
appears that it shouldn't be a conflict.

Thanks,

j

-- 
John Gateley <gateley@jriver.com>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org