How do others fare with merging?

We have been using svn for a while now, but there is one hump our devs
all hit including me. Merging.

Whether merging from trunk to a branch, or vice-versa there are issues
that pop up, and I've found them hard to pin down. Often a merge will
indicate conflicts with files not touched at all in the branch, or not
merge what has.

I am certain in my personal cases that I've gotten the correct revision
numbers right, and have moved them around. It just seems to get confused
anyway. Most of us have used cvs and other systems for years, I don't
really think it's operator error unless we all are really goofed up in
the same way.

Also when this happens I tend to think of clients, but oddly enough
using tortoise, subclipse or command line has done the same thing.

This isn't to diagnose, I know it's too vague, I just am wondering if
anyone else has this kind of general issue. We've been through a few
revs and it's been about the same.

Rick

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Jul 11 11:02:12 2005