Subversion Merges

If you ever need to update your branch with the latest from the trunk, you can perform this command:
c:\branches\yourbranch> svn merge svn://sourcecontrolserver/svn/Repo/trunk .
Where c:\branches\yourbranch is the working folder of your branch, svn://sourcecontrolserver/svn/Repo/trunk is the server side path to the trunk, and . is the current Windows folder (which in this case, is your working folder of your branch)

Viola. Hope you don't have any merge issues.

Zoidberg away!

No comments: