Re: 2 users working on same file caused a change to be reverted rather than merged

Rupert Hunt <rupert_at_pagedevelopers.com> writes:

> Does anyone know why this might have happened?

The usual mistake is :

Alice opens file.txt in her editor.

Bob opens file.txt in his editor.
Bob edits, and commits.

Alice runs "update" outside her editor.
Alice saves the file to disk, overwritting "update"'s changes.
Alice commits. :-(.

-- 
Matthieu
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1158433
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].