CVS style merge of project files

If you are having a problem using Fortress, post a message here.

Moderator: SourceGear

Post Reply
blefler
Posts: 3
Joined: Wed Mar 26, 2008 9:10 am

CVS style merge of project files

Post by blefler » Wed Mar 26, 2008 9:22 am

We are testing Fortress for use in our project and are intrigued by using CVS over VSS style. We have not used CVS before and are confused by the handling of project files.

Here's the scenario:

-User1 gets project and during work adds project files.
-User2 gets project and during work adds project files, merges and checks in changes.

Now, when User1 is ready to merge he does a 'get latest' on the project, attempting an automatic merge. The project file gets marked as 'needs merge'. Clicking 'show merge' on the project file results in this dialog:
Binary files cannot be merged. If file status is changed to Edited, you can check in the file, overwriting the version currently in the repository. Do you want to set the file status to Edited?
What is the appropriate action at this point? User1 does not want to overwrite the project changes of User2. I can't figure out the correct way to handle this situation that would happen quite often. Remember, we've never used CVS style before and are used to locking files while we do changes.

Please give us a guide/best practices here on how to appropriately use this method.

Thanks,
Bill Lefler

lbauer
Posts: 9736
Joined: Tue Dec 16, 2003 1:25 pm
Location: SourceGear

Post by lbauer » Wed Mar 26, 2008 12:45 pm

You can make the project files mergeable by adding the project file extension to the list of mergeable files for the repository in the Vault Admin Web Client under <Repository name>- File Types.
Linda Bauer
SourceGear
Technical Support Manager

Post Reply