Our code is in SVN. We are developing using Visual Studio and the AnkhSVN plugin.
Using VSS before SVN, I'm used to the idea of locking files so that other users know that they are not editing it during yours (in fact, I thought it was the main source control to prevent lost data from these conflicts).
I was told that this rarely happens and cases where you cannot work, because another developer blocks you more often (this sounds like a principle that can only be applied to a specific subset of dev projects). But in any case, SVN is better, and we use it.
So when I edit a file and iterate over it and find out that another user has edited it too, what am I actually doing ?
Surely there is a better way than saving a copy of my file, returning the changes, updating it from the server, and then merging my changes with winmerge? When I right-click on a file and press "merge", they tell me that I have to update first, so that is clearly not what I need.
.
Update: the partial answer is
OK, it looks like I just click update, then SVN automatically merges the dissenting changes, and let AnkhSVN know about any conflicting changes to allow some kind of resolution. Does anyone know how this works in AnkhSVN - what did I actually do?
( , , ).