Svn Merging Dev/Prod with TortoiseSVN
For some of my professional projects I don't get to choose the environment and when that happens I'm forced to learn or re-learn in this case certain tools/technologies. I can't take complete credit for this article as it was mostly written by a previous co-worker however nothing here is secretive and it shouldn't be; since none of it is proprietary . Merging from Trunk to Branch After making any change in trunk, immediately merge those changes to the branch, Make sure your working copy of your branch has no un-commited changes. Open command prompt and change into tortise bin folder. Usually: c:\Program Files\TortoiseSVN\bin\ Update your branch working copy with the following command: TortoiseProc.exe /command:update /path:C:\ Development \ YOURPROJECT Replace the path parameter with the actual path to your branch working copy Run the following command: TortoiseProc.exe /command:merge /fromurl:https:/ /subversion.com /YOURPROJECT The follo