Comments on: Using Visual SourceSafe – File Merge

By: » Version Control and Visual Studio 2010

» Version Control and Visual Studio 2010 — Thu, 14 Oct 2010 03:42:29 +0000

[...] Multiple check-outs In Solution Explore, files checked out by others appear with a human glyph while files checked out by ourselves appear with a green check mark. If a file is checked out by two developers, merge happens when the second check-in is performed. Depending on whether there are conflicts, visual merge or auto merge occurs. About how merge works for a file, you may read File Merge. [...]

By: Luis Alberto

Luis Alberto — Sat, 29 May 2010 15:26:47 +0000

Muchas gracias kevinGao. Es el mejor tutorial que encontré hasta ahora.

thanks you for share this information.

Luis

By: Omar

Omar — Tue, 10 Nov 2009 15:30:31 +0000

Hi Kevin,
Thanks very much for this tutorial.
i wonder about having binary files and when i wan to use “Merge Branches” this cant be done. so is there a solution for that.

Best Regards

By: srinivas Satavalli

srinivas Satavalli — Thu, 01 Oct 2009 10:01:39 +0000

hi Kevin,

i understand the share-branch-merge for files. but can this be extended to project (Folder Level containing Files). If Yes how can the conflicts be resolved?

Example:
A folder X having 10 files are shared & Branched to a new folder Y.
Now users work on folder x ans say 2 files are changed, and other users work on folder y and change the same 2 files which were modified in X folder . Now how can we merge the two folders X and Y.

Can this be done in the same way as we do it for files?

Regards,
Srini

By: Hong

Hong — Mon, 31 Aug 2009 20:25:11 +0000

Hi, Kevin,

This is very helpful! We have vss 6.0 now and need to handle branching and merging for our project. All the features you talked about here can we also do it in vss6.0? I can see there are Share, Brand and Merge Branches links from the “SourceSafe” tab, I assume they can help with branching, share and merge. However, I can not find anything that user can do multiple checkouts. Is there something I need to set up or it’s just not in vss6.0? How to set it up?

Do you have any tutorial doc for vss6.0?

Thanks a lot.

Hong