What happened is, the VS merge tool mistakenly matched up two entirely different methods and attempted to “merge” the changes. However, I had “an incident.” “Incidents” are bad when merging. The built-in VS2010 merge/compare tool works. Replace your client-side merge tool with one you can trust. Let me know in the comments if you can definitely blame TFS 2010 automerge for a botched merge. We’ve had merging issues, but I’m not convinced our merging issues are automerge issues. TFS 2010 has improved, and our team has had almost perfect success with automerging, though there are hiccups here and there. In TFS 2010, I will 99% certify that automerging works. performing server-side merges), so the only way to win, was not to play. TFS 2005 was notoriously bad at auto-merging (i.e. If you are having problems with TFS merges, you can solve all your problems by manually merging every file. Tips for working with TFS source control Merging I can fire off out a bulleted list of specific ways TeamCity is better, but in the interest of staying positive, let’s just move on. Mini-review of TFS’s continuous integration featuresetīetween TeamCity and TFS, having used both in two environments and having recently used the newest versions of both, I’d prefer TeamCity in a landslide. I’ll only provide helpful workarounds I’ve found. All positiveĪll-positive means that I will not complain about TFS. I’ll assume you work with TFS on a daily basis, and thus won’t attempt to explain TFS concepts (shelving, for example). ![]() What follows is a short, all-positive compilation of everything I’ve learned about TFS 2010. This post is a grab bag of information, techniques, and landmines I wish someone had told me when we first set out to run our build/deploy on top of TFS.
0 Comments
Leave a Reply. |