Merge issues.

I'm just not getting it.

I created a branch of a subdirectory in subversion at revision 25,
made a change of a file at revision 26 on the new branch. I also
made some changes to the file on the trunk in order to create
a conflict, that was revision 27. Now I need to merge the two
changes together on the trunk and it's not working.

File: UIResources.properties

            --------26------- ui-rel-1.0 branch
           /
          /
---24--25/----------------27----- trunk

cd trunk
svn update
At revision 27.
svn merge -r26:27
http://subversion/svn/prodops/branches/ui-rel-1.0/src/com/outerbay/ui/UI
Resources.properties
http://subversion/svn/prodops/trunk/adm-suite/ui/src/com/outerbay/ui/UIR
esources.properties

What am I doing wrong?

Thanks,

Carter.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jan 26 22:04:28 2005