How to disable merging

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

Moderator: SourceGear

Post Reply
StevenBlack
Posts: 13
Joined: Sat Apr 05, 2008 7:20 pm
Location: Canada

How to disable merging

Post by StevenBlack » Sat May 02, 2009 11:59 pm

Using SOS 4.2 Long, long time SOS user, and I'm now considering ditching it out of exasperation

I want to absolutely disable merging. How do I do that?

Currently I am getting endless messages such as the one pasted below my sig.

I NEVER merge. I don't care about merge. Store this version, dag nab it! Please help me make SOS work without fanfare. Currently nothing works, no check-ins are possible regardless of what I do,

Thank you.

**--** Steve

---------------------------
SourceOffSite
---------------------------
Check In failed for file: $/xxxxx/xxx/xxxx.html.
The server was unable to perform an automatic merge. To merge conflicts, go to Tools->Merge->Show Merge.
WARNING: The next Check In operation performed on this file will overwrite the latest copy in VSS even if conflicts are not resolved.

Beth
Posts: 8550
Joined: Wed Jun 21, 2006 8:24 pm
Location: SourceGear
Contact:

Re: How to disable merging

Post by Beth » Mon May 04, 2009 8:00 am

You can right-click the file, select Merge - Resolve Status, and that will change the status of the file from needing a merge to just edited. Then if you check it in, the file will overwrite what is in the database.

Another way of dealing with it is to disallow multiple checkouts in the VSS admin tool. If you aren't running into the merges with others checking out the same file, then let me know.
Beth Kieler
SourceGear Technical Support

Post Reply