Skip navigation

If you branched at revision 23, and you want to merge changes on trunk into your branch, you could do this from inside the working copy of your branch:

$ svn merge -r 23:30 file:///tmp/repos/trunk/vendors  
U  myproj/thhgttg.txt

So all changes from 23:30 will be merged into your branch from trunk (in this example /trunk/vendors). It’s good practice to put what revisions you’ve merged in your commit message so the next time you merge you can check the svn log and see where you last left off before new changes in trunk were committed. Or, you could simply use git or hg and call it a day.

Posted via web from Apphacker’s learning curve

Advertisements

Leave a Reply

Fill in your details below or click an icon to log in:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out / Change )

Twitter picture

You are commenting using your Twitter account. Log Out / Change )

Facebook photo

You are commenting using your Facebook account. Log Out / Change )

Google+ photo

You are commenting using your Google+ account. Log Out / Change )

Connecting to %s

%d bloggers like this: