SourceGear Support

Could you contact me offline to diagnose this problem? My email is eric@sourcegear.com

Thanks.

This message is actually harmless. The fact that it appears in your event log is an annoyance which we will fix, but you don't need to worry about it.

We will get back to you on this issue ASAP. In the meantime, could you let us know exactly which version of Vault you are using?

Thanks.

At the file level, merge is a 3-way operation -- you need three versions of the file: 1. The older version from the origin 2. The newer version from the origin 3. The target version In this situation, you have only two, since #1 above is not present. Vault has only two files to work with, so it can'...

See <a href="http://support.sourcegear.com/viewtopic ... 7">here</a> for additional information.

We have lots of information available. I'd start here with the knowledge base for Vault: http://support.sourcegear.com/viewtopic.php?t=792 You might also want to see the Source Control HOWTO, an online book in progress on my weblog: http://software.ericsink.com/scm/source_control.html You can downlo...

The Merge Branches wizard is the way to do this. You will be given the chance to select which changes you want to merge, and you can select only a single file if you want.

gmagana wrote:LOL, I imagine SourceGear people are looking for a way to put the DW integration in just to get rid of this thread!

Bingo.

Good suggestions. I've logged both in our bug list. If the CenterParent thing is as easy as it appears, it will get done sooner than the other one.

Thanks.

I have a special build of the client which contains an attempted fix for this problem. This is not an official build. If you would like to give it a try, contact me by email.

eric@sourcegear.com

We've seen this situation 2-3 times now. It's not actually related to merge branches directly. I have a vague recollection that increasing the timeout was a workaround. How much did you increase it? The real question remains why it is timing out to begin with. I'll keep digging for an answer to this...

Sorry for the slow reply on this. I need to work with you more closely to figure out what is going wrong in your situation. Could you email me?

eric@sourcegear.com

Thanks.

I am using v. 3.0.5. I have two branches that have some substantial differences in some of the files. I've run the merge wizard. I've committed the changes. The only thing that seems to work right is that files are added to the one branch from the other that were not already there. However, any cha...

Hmmph. That's not supposed to happen.

To diagnose this problem I need to ask some questions. Could you contact me by email?

eric@sourcegear.com

Thanks,

I think this might be one of the bugs fixed in 3.0.6. Could you try upgrading?