SVN Update conflict resolution

The first is to use the Update option for conflict resolution, which means that the-accept parameter is used as a conflict handling mode regardless of whether the current copy copy is the latest version

–accept Arg:specify Automatic Conflict resolution action
(' Postpone ', ' base ', ' mine-conflict ',
' Theirs-conflict ', ' mine-full ', ' theirs-full ',
' Edit ', ' launch ')

(p)   Postpone   –mark the conflict to be resolved later//Let the file remain in a conflict state after the update is complete.
(DF) diff-full  –show All changes made to merged file//uses the standard distinguished format to show the difference between the base revision and the conflicting file itself.
(e)   Edit       –change merged file in an editor//open conflicting files with your favorite editor, The editor is set by the environment variable editor.
(R)   Resolved   –accept merged version of File//finish editing the files, notify SVN that you have resolved the file conflict, it must accept the current content- Essentially, you have "solved" the conflict.
(MF) mine-full  –accept My version of entire file (ignore their change//discards the new changes received from the server and only uses the local modifications that you view the files.
(TF) theirs-full–accept their version of entire file (lose my changes)//discard your local modifications to the view file, using only the newly received changes from the server.
(l)   launch     –launch External tool to resolve conflict//start an external program to perform conflict resolution, This requires some pre-preparation.
(h)   Help       –show This list//displays all commands that may be used in conflict resolution.