HighTechTalks DotNet Forums  

Prevent Auto merge

Visual Studio.net (VSS) microsoft.public.vsnet.vss


Discuss Prevent Auto merge in the Visual Studio.net (VSS) forum.



Reply
 
Thread Tools Search this Thread Display Modes
  #1  
Old   
Joe
 
Posts: n/a

Default Prevent Auto merge - 12-18-2005 , 12:15 PM






Is there a way to prevent VSS 2005 from doing an auto merge?

-Joe



Reply With Quote
  #2  
Old   
Joe
 
Posts: n/a

Default Re: Prevent Auto merge - 12-18-2005 , 01:56 PM






I changed the option to allow only a single checkout. This seems to work.

"Joe" <jbassking (AT) noemail (DOT) noemail> wrote

Quote:
Is there a way to prevent VSS 2005 from doing an auto merge?

-Joe




Reply With Quote
  #3  
Old   
Alin Constantin [MSFT]
 
Posts: n/a

Default Re: Prevent Auto merge - 12-21-2005 , 06:40 AM



A better option is to allow multiple checkouts, but set in SSExp
Tools/Options/General page
"Use visual merge"=="Yes" (instead of "Only if there are conflicts")
--
Alin Constantin
This posting is provided "AS IS" with no warranties, and confers no rights.


"Joe" <jbassking (AT) noemail (DOT) noemail> wrote

Quote:
I changed the option to allow only a single checkout. This seems to work.

"Joe" <jbassking (AT) noemail (DOT) noemail> wrote in message
news:%23zy2fa$AGHA.2620 (AT) tk2msftngp13 (DOT) phx.gbl...
Is there a way to prevent VSS 2005 from doing an auto merge?

-Joe






Reply With Quote
Reply




Thread Tools Search this Thread
Search this Thread:

Advanced Search
Display Modes

Posting Rules
You may not post new threads
You may not post replies
You may not post attachments
You may not edit your posts

vB code is On
Smilies are On
[IMG] code is On
HTML code is Off



Powered by vBulletin Version 3.5.4
Copyright ©2000 - 2008, Jelsoft Enterprises Ltd.