Comments on: My Day Job http://blog.checkoutmycards.com/2007/06/26/my-day-job/ Making it safe and easy to buy and sell sports cards Sat, 14 Nov 2009 00:55:18 +0000 http://wordpress.com/ hourly 1 By: Tim Getsch http://blog.checkoutmycards.com/2007/06/26/my-day-job/#comment-229 Tim Getsch Wed, 27 Jun 2007 04:12:50 +0000 http://checkoutmycards.wordpress.com/2007/06/26/my-day-job/#comment-229 Dave, good question. Yes, Team Foundation does support code merge. However, Access forms, reports, and queries are not merge friendly. Usually you have to manually fix merge conflicts, and that is why Access defaults to only letting multiple people check out VBA modules. VBA merges nicely. Dave, good question. Yes, Team Foundation does support code merge. However, Access forms, reports, and queries are not merge friendly. Usually you have to manually fix merge conflicts, and that is why Access defaults to only letting multiple people check out VBA modules. VBA merges nicely.

]]> By: Dave Persing http://blog.checkoutmycards.com/2007/06/26/my-day-job/#comment-227 Dave Persing Wed, 27 Jun 2007 03:08:57 +0000 http://checkoutmycards.wordpress.com/2007/06/26/my-day-job/#comment-227 Congratulations on shipping! On a Team Foundation Server note, does the SourceSafe diff tool support any sort of code merge? PS - That's a leading question because I have a separate solution that I used on our code line this afternoon. (This was in part ghost-written by Toby who's sitting my velcro chair). Congratulations again! -Dave Persing Congratulations on shipping!

On a Team Foundation Server note, does the SourceSafe diff tool support any sort of code merge?

PS – That’s a leading question because I have a separate solution that I used on our code line this afternoon. (This was in part ghost-written by Toby who’s sitting my velcro chair).

Congratulations again!

-Dave Persing

]]> By: Toby Getsch http://blog.checkoutmycards.com/2007/06/26/my-day-job/#comment-226 Toby Getsch Wed, 27 Jun 2007 02:42:33 +0000 http://checkoutmycards.wordpress.com/2007/06/26/my-day-job/#comment-226 Hey, congrats on shipping! Also cool to hear of your dogfooding success. Kudos! Hey, congrats on shipping! Also cool to hear of your dogfooding success. Kudos!

]]>