We are using IntelliJ 9.0.4. We have a production branch for hotfixes. Furthermore we have a trunk for the main development. Regularly we want to merge the hot fixes from the production branch into the trunk.
For some reason some unchanged files, among these buildserver generated files, are marked as changed. These will then be committed in the next commit. When we then look at the before and after revision, Sventon tells the files are identical.
Why are these files marked as changed? Is it a time stamp issue? Is there something we can do to avoid this?