Anybody describe me with the example and step by step operation about how to branch a code and then after branching how to merge back the changes in main code.
Thanks & Regards, Hussain
+1
A:
Switch to TFS while you can.
I don't think you can merge entire branches in VSS. In TFS both operations are matter of a few clicks.
Fedor Hajdu
2010-01-04 12:14:06
+1
A:
There is no branching is VSS. All work is done on the main trunk. Use a better version control tool if you can.
What you could do, if you felt so inclined, is:
Branching
- Get the latest version of the code of the project you want to branch
- Create a new VSS project
- Copy your code into the working folder of the new project (this is your new "branch")
- Make your changes
- Commit them into the new project
Merging
- Take the code of your branch and copy it into the folder holding the latest version of the original project.
- Hope no one else had the original project checked out
- Commit the changes
I don't recommend this.
Matt Ellen
2010-01-04 12:21:30
No problem Hussain Ali. In future, at stack overflow, you should add a comment to an answer, rather than creating a new answer, for this sort of message.
Matt Ellen
2010-01-04 13:30:08
And you should also mark an answer "accepted" (by clicking the check mark next to it) if it was helpful.
0xA3
2010-01-04 15:16:59