Whatever I do, when I want to commit a solution to my repository I always get a conflicts message.
Example:
1. I check out a solution.
2. I make a change to a method.
3. I commit the solution but see a conflict
4. The conflict reported is an update I have to perform from the server to the local file ????
5. When I push the 'changed' lines from right to left in the synchronized view and save the changed file it immediately jumps into conflict mode ????
How can this be?
To summarize, I can not commit a local file because it differs from the remote file. And I can not commit an identical file because it is.... I am lost.
The ONLY way I can commit is to set files as merged manually and it will work.
Did I do something wrong pre 4.1?
How can I make this go away?
And, when this all occurred I am pretty sure that the commit failed without notice.
So far the only way to reliably have changes committed to the repository was export and re-import??