Does SOS Collab support merging after branch?

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

Moderator: SourceGear


Posts: 4
Joined: Fri May 14, 2004 11:11 am
PostPosted: Fri Oct 01, 2004 2:04 pm
I am able to share and branch files using SOS but the merge command is not available in the Windows client. Is there anyway to merge files back together with SOS?

Posts: 9736
Joined: Tue Dec 16, 2003 1:25 pm
Location: SourceGear
PostPosted: Sun Oct 03, 2004 7:41 pm
What type of merge are you trying to do? Merge an edited branch back into the original file branched from? SOS Collab does not have support for that type of operation.

SOS Collab does support merge on checkin with a file in the repository that may have changed after your file was checked out. You would need a diff/merge tool configured, like Beyond Compare, which ships with SOS Collab.
Linda Bauer
SourceGear
Technical Support Manager

Posts: 4
Joined: Fri May 14, 2004 11:11 am
PostPosted: Wed Oct 06, 2004 4:22 pm
Yes, I was looking to merge a branched file back to the original. I suppose there might be someway to do it manually using beyond compare... I'll see what I can come up with.

Return to Support (Collab)

Who is online

Users browsing this forum: No registered users and 1 guest

cron