We want to use Version Control System in our application development process. But we have serious problem that make using version control systems impossible for us.
We have applications on server and we want to modify them with controlling all changes in version control system, for example SVN. One of developers makes on-disk project and then shares it in repository. Then other developers check out this project. Before this all things goes well.
Every design element have two properties called 'modified':
- modified (initially);
- modified (In this file).
For unknown reasons these properties may be different in one replica. When one developer make changes, "modified (initially)" datetime sets in his on-disk project, but in other developers on-disk projects sets "modified (In this file)" datetime. For example:
- From Modified (initially):
<modified><datetime>20131114T120023,10+04</datetime></modified>
- From Modified (In this file):
<modified><datetime>20131114T120025,04+04</datetime></modified>
As a result we have DIFFERENT on-disk projects from the SINGLE nsf application. Version control turns to constant struggle with conflicts.
Is it possible to solve this problem? Or there's only one possibility to use local copies\replicas for each developer?
Thank you for any help!