Merge Issue

[plantrol]

Help!

I have 2 developers who made changes and did not check them out first. Noe we have 2 versions and I can not get them to merge no matter what I do. How should I go about doing this? It never shows needs merge.

Joe

[lbauer]

You might be able to get to a Needs merge state with the following steps:

1) have each user backup their modified files, then do Get Latest to establish new baselines in the working directory.

2) Make sure exclusive checkouts are not mandated in the repository settings in the Vault Admin Web Client.
Then have both users check out the file non-exclusively. Replace the files in the working directory with the backed up modified files. Both users should now see an Edited status.

3) User A should check in his modified file. His file status will be blank. UserB should now see a Needs Merge status. Needs Merge means a file is modified and Old.

From here, UserB should be able to right-click on the file and Show Merge, then resolve any merge issues.