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
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.
This is not a bug in CVS. If project system modifies its metadata and there are
frequent conflicts in them I can do nothing about it. Reassigning.
There should not be spurious changes to genfiles.properties; only if you make a
real change to project.xml, or you are using a new stylesheet. The former case I
cannot really do anything about without some API from the VCS module. The latter
case is mentioned in issue #42735.
Recent dev builds have problems with Mustang; see issue #62006.
*** This issue has been marked as a duplicate of 42735 ***