Version Control with Subversion - Login

Basic UsageIf you've postponed a conflict, you need to resolve the conflict before Subversion will allowyou to commit your changes. You'll do this with the svn resolve command and one of severalarguments to the --accept option.If you want to choose the version of the file that you last checked out before making youredits, choose the base argument.If you want to choose the version that contains only your edits, choose the mine-full argument.If you want to choose the version that your most recent update pulled from the server (andthus discarding your edits entirely), choose the theirs-full argument.However, if you want to pick and choose from your changes and the changes that your updatefetched from the server, merge the conflicted text “by hand” (by examining and editingthe conflict markers within the file) and then choose the working argument.svn resolve removes the three temporary files and accepts the version of the file that youspecified with the --accept option, and Subversion no longer considers the file to be in astate of conflict:$ svn resolve --accept working sandwich.txtResolved conflicted state of 'sandwich.txt'Merging conflicts by handMerging conflicts by hand can be quite intimidating the first time you attempt it, but with alittle practice, it can become as easy as falling off a bike.Here's an example. Due to a miscommunication, you and Sally, your collaborator, both editthe file sandwich.txt at the same time. Sally commits her changes, and when you go toupdate your working copy, you get a conflict and you're going to have to edit sandwich.txtto resolve the conflict. First, let's take a look at the file:$ cat sandwich.txtTop piece of breadMayonnaiseLettuceTomatoProvolone> .r2Creole MustardBottom piece of breadThe strings of less-than signs, equals signs, and greater-than signs are conflict markersand are not part of the actual data in conflict. You generally want to ensure that those areremoved from the file before your next commit. The text between the first two sets of markersis composed of the changes you made in the conflicting area: