I frequently work on the same project on two different machines.  Very often I
get a message that there are conflicts, but I can see nothing in the projects
tab that has a conflict.

It turns out it is almost always genfiles.properties and friends in nbproject/.

I'm not sure what the right resolution for this is, but it seems like pretty
confusing behavior, especially since there is no obvious way for a user to tell
how they should resolve it - let the local revisions clobber the remote ones or
vice versa.

I *think* the right behavior is to always assume the local version is correct; 
the user can still screw this up if they, say, choose to include
genfiles.properties but exclude build-impl.xml when they commit.  At any rate,
some special handling seems pretty desirable here, as it's going to be very
non-obvious to the user what they should do, and the problem comes up almost
every time I switch which computer I'm working on the project on.