Subversion 1.5 – Resolving Conflicts
Subversion 1.5 adds functionality for conflict resolution during merges.The new functionality is exposed through the Subversion APIs so GUI clients can take advantage of it.
Subversion 1.5 adds functionality for conflict resolution during merges.The new functionality is exposed through the Subversion APIs so GUI clients can take advantage of it.
Because Subversion preserves all history, it is easy to undo changes and get your files back to a previous state. Mark Phippard explains how.
Subversion supports both the copy-modify-merge and lock-modify-unlock version control models of managing changes to files while hopefully avoiding conflicts with other collaborators. C. Michael Pilato contrasts the two models, describes how Subversion implements them, and suggests when to employ each model for maximize productivity.
Subversion 1.5 introduces changelists which lets you arbitrarily label working copy files for the purpose of associating multiple files together, typically the files related to a particular change you are working on.