I agree the built in merge tool for TFS is really bad but you can configure to use other tools. I use Araxis Merge which makes the merge experience in TFS much better. It has been a few years since I used CVS and SVN but I never experienced a good integration with tools back then. Personally the experience with TFS have only been good getting a well integrated IDE source control and bug tracking. First versions had a lot to wish for when it comes to how bugs/work items could be linked and worked with but nowadays I'm satisfied. And the shelveset feature of TFS have elimitaed almost all needs I had for private branching before.
/E On Thu, Jan 27, 2011 at 09:36, Ryan Riley <[email protected]>wrote: > On Wed, Jan 26, 2011 at 2:18 PM, Chris Tavares <[email protected]>wrote: > >> Branching always seemed to be just about the same as SVN to me, but I >> freely admit I didn’t use branches much in SVN. I’d love to hear why you >> think it’s so much worse than SVN. Blows chunks compared to Git or >> Mercurial? Absolutely. >> > > TFS branching and merging is indeed much worse than SVN. TFS does next to > nothing to merge for you. At least it didn't when I last used it. I had a > case once when merging in a feature branch with 300+ "conflicts." I think I > had 2 files with maybe two real conflicts, yet I had to go through every > file and manually "merge" everything. > > Ryan > > -- > You received this message because you are subscribed to the Google Groups > "Seattle area Alt.Net" group. > To post to this group, send email to [email protected]. > To unsubscribe from this group, send email to > [email protected]<altnetseattle%[email protected]> > . > For more options, visit this group at > http://groups.google.com/group/altnetseattle?hl=en. > -- You received this message because you are subscribed to the Google Groups "Seattle area Alt.Net" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/altnetseattle?hl=en.
