[svnbook] r4194 committed - * en/book/ch09-reference.xml...
svnbook at googlecode.com
svnbook at googlecode.com
Thu Nov 10 12:07:25 CST 2011
Revision: 4194
Author: cmpilato at gmail.com
Date: Thu Nov 10 10:00:26 2011
Log: * en/book/ch09-reference.xml
Document the 'mine-conflict' and 'theirs-conflict' arguments to 'svn
resolve --accept'.
http://code.google.com/p/svnbook/source/detail?r=4194
Modified:
/trunk/en/book/ch09-reference.xml
=======================================
--- /trunk/en/book/ch09-reference.xml Thu Nov 10 09:59:48 2011
+++ /trunk/en/book/ch09-reference.xml Thu Nov 10 10:00:26 2011
@@ -5056,8 +5056,8 @@
<term><literal>working</literal></term>
<listitem>
<para>Assuming that you've manually handled the
- conflict resolution, choose the version of the file as
- it currently stands in your working copy.</para>
+ conflict resolution, choose the version of the file
+ as it currently stands in your working copy.</para>
</listitem>
</varlistentry>
@@ -5065,8 +5065,8 @@
<term><literal>mine-full</literal></term>
<listitem>
<para>Resolve all conflicted files with copies of the
- files as they stood immediately before you
- ran <command>svn update</command>.</para>
+ files as they stood immediately before you
+ ran <command>svn update</command>.</para>
</listitem>
</varlistentry>
@@ -5074,8 +5074,28 @@
<term><literal>theirs-full</literal></term>
<listitem>
<para>Resolve all conflicted files with copies of the
- files that were fetched from the server when you
- ran <command>svn update</command>.</para>
+ files that were fetched from the server when you
+ ran <command>svn update</command>.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>mine-conflict</literal></term>
+ <listitem>
+ <para>Resolve all conflicted files by preferring local
+ modifications over the changes fetched from the
+ server in conflicting regions of each file's
+ content.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term><literal>theirs-conflict</literal></term>
+ <listitem>
+ <para>Resolve all conflicted files by preferring the
+ changes fetched from the server over local
+ modifications in conflicting regions of each file's
+ content.</para>
</listitem>
</varlistentry>
More information about the svnbook-dev
mailing list