Merge a single changeset

I am having problems trying to merge a single change. in r4238 i
changed one line in one file. Trying to merge from a branch back to the
trunk...

$ pwd
/svn/trunk

$ svn merge -r4238:HEAD http://svn.thism.com/svn/branches/beta2
Conflict discovered in 'docroot/css/style.css'.
Select: (p) postpone, (df) diff-full, (e) edit,
         (h) help for more options:

And it keeps going on, complaining about dozens of files. This is not
the file that I changed. How do I bring over changes one at a time?

-jsd-

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-10-29 22:51:41 CET