How to merge on project / multiple files in VSS?

Posted by Vijay on Stack Overflow See other posts from Stack Overflow or by Vijay
Published on 2009-12-17T06:37:16Z Indexed on 2010/05/23 4:00 UTC
Read the original article Hit count: 212

Filed under:

visual-sourcesafe

|

merging

I have VSS 6.0. I have branched my project so that I can do parallel development. I have 100s of files in folder/subfolders. I have changed some 10-20 files in multiple folders in ver 2 branch.

Now I want to merge changes done in ver 2 to ver 1 branch. When I select the project merge branches option is not enabled. neither is it enabled when I select multiple files inside a folder. It's only enabled when one file is selected.

Can I not merge on folder / multiple files in VSS 6.0. My thinking was when I do merge on project, VSS would pop up file names whenever there's a conflict (i.e files that are changed)

© Stack Overflow or respective owner

Related posts about visual-sourcesafe

Visual SourceSafe: Architecture/Management

as seen on Stack Overflow - Search for 'Stack Overflow'
I was looking for information on how other people with larger teams manage SourceSafe currently. I was looking for recommendations and advice for a new project I was setting up that will allow for a few key things Scalability Manage multiple overlapping releases Geared more around .NET however allows… >>> More
Visual Sourcesafe server for practice

as seen on Stack Overflow - Search for 'Stack Overflow'
Hi, I there a Visual SourceSafe server running somewhere that I can connect to for practice? I have a couple of things that I would like to test before buying the VSS server but I don't want to download the whole app for testing. Best regards >>> More
Retrieve Deleted Project in MS Visual SourceSafe?

as seen on Stack Overflow - Search for 'Stack Overflow'
A while ago, I "tidied up" our Visual SourceSafe repository, including deleting a duplicate of one project. It now turns out that the duplicate had some code I need to see. How can I get back a deleted project? I can't see from any of the docs how to do this. Thanks for any help. >>> More
Visual Sourcesafe, sharing: commits to wrong location

as seen on Stack Overflow - Search for 'Stack Overflow'
I have a project under my management. It has the following structure: $/Code/MainSolution $/Code/Branches I want to branch the MainSolution in $/Code/Branches So I do it, (it works perfectly), I set a working folder for that project and do a 'get latest'. But when I open that solution in Visual… >>> More
Maven freezes while perfoming scm:update on VSS

as seen on Stack Overflow - Search for 'Stack Overflow'
Im trying to get source files from VSS using Maven. But when I execute command mvn -DvssDirectory="C:\Program Files\VisualSourceSafe\win32" scm:update the log goes to [INFO] [scm:update {execution: default-cli}] [INFO] Executing: cmd.exe /X /C ""C:\Program Files\VisualSourceSafe\win32\ss" Get… >>> More

Related posts about merging

Advantages of three-way automatic merging vs. two-way

as seen on Stack Overflow - Search for 'Stack Overflow'
I'm interested in understanding two-way and three-way merging of source code files. Based on what I've read, two-way merging has some "crippling weaknesses" compared to three-way merging. What I'd really like to see are one or two simple, concrete examples of cases where three-way merging is able… >>> More
Tools for Maintaining Branches in SVN

as seen on Stack Overflow - Search for 'Stack Overflow'
My team uses SVN for source control. Recently, I've been working on a branch with occasional merges from the trunk and it's been a fairly annoying experience (cf. Joel Spolsky's "Subversion Story #1"), so I've been looking alternative ways to manage branches and merging. Given that a centralized SVN… >>> More
What's so difficult about SVN merges? [closed]

as seen on Programmers - Search for 'Programmers'
Possible Duplicate: I’m a Subversion geek, why should I consider or not consider Mercurial or Git or any other DVCS? Every once in a while, you hear someone saying that distributed version control (Git, HG) is inherently better than centralized version control (like SVN) because merging is… >>> More
Branching strategy for frequent releases

as seen on Programmers - Search for 'Programmers'
We have very frequent releases and we use Git for version control. When i am mentioning about frequency, please assume it to include bug-fixes and feature release too. All releases are eventually merged into ‘mainline’. When a release is deployed on production and if a bug is identified, people start… >>> More
Finish feature reverted commits from develop

as seen on Programmers - Search for 'Programmers'
I am using git as a version control system, and using git-flow as the branching model. I started a feature branch some weeks ago in order to maintain the system in a clean state while developping that feature. The main development continued on the develop branch, and changes from develop were merged… >>> More