| 18 | Handling Conflicts |
When two people change the same part of the same file, Subversion cannot automatically merge the changes. Conflicts are actually quite rare because they indicate that two people were working on exactly the same thing. Sometimes two developers will try to fix the same bug and end up changing the same file and cause a conflict or will be working on a common data structure and both change it. Being on the receiving end of a merge conflict is usually an indicator that you should be talking more often with your colleagues.
If Alice and Bob are both working on the same part of the same file and Alice checks in first, she won’t notice a problem. When Bob comes to check in, he’ll be told that his version of the file is out-of-date; ...
Get Pragmatic Guide to Subversion now with the O’Reilly learning platform.
O’Reilly members experience books, live events, courses curated by job role, and more from O’Reilly and nearly 200 top publishers.
