I have the same problem.  Everyone is always saying how easy merging is, but if two developers work on the same code it's going to be hard to reconcile no matter what git can do.  Merging is merging is merging.  If, for example, I make a change to a file and another developer refactors it out of existence there's no tool out there that's going to automatically figure out the merge.  Someone has to sit down and spend some brain cells to figure it out, whether he's using git or subversion.