Skip to Main Content
Pragmatic Guide to Subversion
book

Pragmatic Guide to Subversion

by Mike Mason
November 2010
Intermediate to advanced content levelIntermediate to advanced
150 pages
2h 55m
English
Pragmatic Bookshelf
Content preview from Pragmatic Guide to Subversion
18Handling 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; ...

Become an O’Reilly member and get unlimited access to this title plus top books and audiobooks from O’Reilly and nearly 200 top publishers, thousands of courses curated by job role, 150+ live events each month,
and much more.
Start your free trial

You might also like

Reinventing the Organization for GenAI and LLMs

Reinventing the Organization for GenAI and LLMs

Ethan Mollick

Publisher Resources

ISBN: 9781680500035Errata Page