Merging changes

List,

This is my first posting, so please be kind...

I'm a new Subversion user, trying to get my changes merged into the repository.
Here's what I did.

Loaded the repository with the original software.
A co-worker checked out all the software, I didn't.
I made changes to my original software, but didn't do a checkout from SVN.
The co-worker checked in his changes.

Now I want to get my changes 'merged' into his.

I checked out the software.
I moved my 'modified files' into the working directory, replacing original files.
I did an SVN Update. Nothing happened!

So my question is: how can I get SVN to merge my changes into the version from the
repository?

I hoped that be replacing the files in the working directory with my versions, SVN
would then merge my changes into the repository version. Can I fix this without doing
a manual 'diff'?

Thanks List,

Ric

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Nov 11 02:09:35 2005