CVS Conflict Resolution Example A checks out a copy of the project B checks out a copy of the same project B makes a batch of changes and commits C checks out a copy that includes B’s changes B makes a second batch of changes, commits A starts to work on his local copy, unaware of the changes, and tries to commit his changes What happens?

CVS – What Happens? If none of the files A changed has been edited by B, the commit succeeds If CVS detects that some of A’s changes relate to files B changed, then CVS informs A that he must make an update When A runs an update, CVS merges B’s changes into A’s local copy If conflicts, A must resolve, possibly with B When C makes an update, he will receive B’s second changes, and A’s first and possibly second batch of changes after conflict resolution