421 reputation
24
bio website
location San Jose, CA
age 55
visits member for 4 years, 3 months
seen Nov 7 at 22:18

Jun
9
awarded  Yearling
Feb
9
answered What should I do when I find sensitive information in version control?
Jan
30
comment Why are developer commit statistics harmful?
I believe that this Dilbert comic makes the case as well as anything I've ever seen.
Dec
8
comment What's the best way to handle multiple simultaneous “streams” of development in version control?
That "plan" (refactoring) is about the scariest thing I have ever seen someone seriously propose. If they actually implement that, it's definitely fodder for TheDailyWTF.
Nov
24
awarded  Citizen Patrol
Sep
9
awarded  Yearling
Aug
1
comment What revision control has the best merging engine?
What do you mean by "main merge tool?" The default algorithm, or the one you've specified? If you mean the latter, as fair as I know, none of them work that way. Every VCS I'm familiar with uses their internal algorithm to merge and only invokes the user-selected tool if there is a conflict. Note that some VCSs like git do allow you to choose among several built-in strategies, and some VCSs have fairly sophisticated internal algorithms -- but that leads to the problem I described in my answer.
Aug
1
comment What revision control has the best merging engine?
By default, Mercurial uses a simple three-way merge algorithm. However, yes, you can override that. You can override the built-in merge in most VCS tools, for that matter. However, AFAIK, all of them use some internal merge algorithm to look for conflicts, and that is really a key point here -- if your VCS's internal merge algorithm is too clever, it may not find a conflict where it should.
Jul
30
awarded  Nice Answer
Jul
30
comment What revision control has the best merging engine?
Every VCS has a built-in merge algorithm that it uses -- the merge tools you refer to only get used when there are conflicts that the internal engine cannot resolve. The question being asked is, which VCS merge algorithm is the "best", although I'm not sure that's a well-defined question. Some people define it as "produces the fewest conflicts needing resolution"; I'd say, gives the fewest errors.
Jul
30
answered What revision control has the best merging engine?
Jan
27
answered Preserving version control commit history vs Refactoring and Documentation
Jan
27
comment Why do programming books have such wacky cover art?
@Cyrena: Yeah, I know Wrox means well but my God they should reconsider some of their covers...
Dec
22
comment Absolute statements in IT that are wrong
This is true of spoken/written language as well.
Dec
11
awarded  Teacher
Dec
10
answered Which Continuous Integration framework do you use and why?
Dec
10
awarded  Supporter