.NET Development
 
Forums: » Register « |  User CP |  Games |  Calendar |  Members |  FAQs |  Sitemap |  Support | 
 
User Name:
Password:
Remember me
 



Go Back   Dev Articles Community ForumsProgramming.NET Development

Reply
Add This Thread To:
  Del.icio.us   Digg   Google   Spurl   Blink   Furl   Simpy   Y! MyWeb 
Thread Tools Search this Thread Display Modes
 
Unread Dev Articles Community Forums Sponsor:
  #1  
Old November 19th, 2010, 05:43 PM
complete complete is offline
Contributing User
Dev Articles Newbie (0 - 499 posts)
 
Join Date: Aug 2006
Posts: 100 complete User rank is Just a Lowly Private (1 - 20 Reputation Level) 
Time spent in forums: 8 h 49 m 8 sec
Reputation Power: 13
How do I resolve conflicts in TFS?

How do I resolve conflicts in TFS?

I must have forgotten to do a recursive get before editing a file. Whatever the cause is, I must now figure out how to resolve a conflict.

When I click on the workspace to performa check-in. One of the files as a two-way pointing arrow which I guess must mean there is a conflect.

When I click to perform a "Check In" a message box appears that tells me:
"No files checked in due to conflicting changes. Please use Conflicts Channel to resolve conflicts and try again".

So I searched online for "Conflicts Channel TFS" and I got some results but all of the results only gave suggestions, like, Click on "Automatic Resolve". The problem is that I do not see any of the menu commands or buttons to ckick on that they suggest.

Reply With Quote
  #2  
Old December 6th, 2010, 07:32 AM
simon123 simon123 is offline
Registered User
Dev Articles Newbie (0 - 499 posts)
 
Join Date: Dec 2010
Posts: 2 simon123 User rank is Just a Lowly Private (1 - 20 Reputation Level) 
Time spent in forums: 27 m 43 sec
Reputation Power: 0
Re:

Just go to your TFS setting and click on the restore default, and after that your will never faced this problem again. Welcome for new idea and question, it would be much appreciated. Once again thanks to the admin.

Reply With Quote
  #3  
Old December 15th, 2010, 02:30 AM
simon123 simon123 is offline
Registered User
Dev Articles Newbie (0 - 499 posts)
 
Join Date: Dec 2010
Posts: 2 simon123 User rank is Just a Lowly Private (1 - 20 Reputation Level) 
Time spent in forums: 27 m 43 sec
Reputation Power: 0
Thanks'

Thanks again for this and i implemented this into my database. If you were not finish than i can guide you on this. This one is better for you.

Reply With Quote
Reply

Viewing: Dev Articles Community ForumsProgramming.NET Development > How do I resolve conflicts in TFS?


Developer Shed Advertisers and Affiliates


Thread Tools  Search this Thread 
Search this Thread:

Advanced Search
Display Modes  Rate This Thread 
Rate This Thread:


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
View Your Warnings | New Posts | Latest News | Latest Threads | Shoutbox
Forum Jump

Forums: » Register « |  User CP |  Games |  Calendar |  Members |  FAQs |  Sitemap |  Support | 
  
 


Powered by: vBulletin Version 3.0.5
Copyright ©2000 - 2018, Jelsoft Enterprises Ltd.

© 2003-2018 by Developer Shed. All rights reserved. DS Cluster - Follow our Sitemap