Version Control with Subversion - Login

Subversion Complete ReferenceNamesvn resolve — Resolve conflicts on working copy files or directories.Synopsissvn resolve PATH...DescriptionResolve “conflicted” state on working copy files or directories. This routine does not semanticallyresolve conflict markers; however, it replaces PATH with the version specified bythe --accept argument and then removes conflict-related artifact files. This allows PATHto be committed again—that is, it tells Subversion that the conflicts have been “resolved.”.You can pass the following arguments to the --accept command depending on your desiredresolution:baseChoose the file that was the BASE revision before you updated your working copy.That is, the file that you checked out before you made your latest edits.workingAssuming that you've manually handled the conflict resolution, choose the version ofthe file as it currently stands in your working copy.mine-fullResolve all conflicted files with copies of the files as they stood immediately before youran svn update.theirs-fullResolve all conflicted files with copies of the files that were fetched from the serverwhen you ran svn update.See the section called “Resolve Conflicts (Merging Others' Changes)” for an in-depth lookat resolving conflicts.Alternate namesChangesNoneWorking copyAccesses repositoryOptionsNo--accept ARG--depth ARG--quiet (-q)--recursive (-R)--targets FILENAMEExamples279