Skip to content

Commit

Permalink
fix reference to incoming_error
Browse files Browse the repository at this point in the history
  • Loading branch information
chenson42 committed May 28, 2012
1 parent d95fe38 commit e0dca52
Showing 1 changed file with 1 addition and 1 deletion.
Expand Up @@ -230,7 +230,7 @@

<para>
For batches in error, from the incoming side you'll also have to decide the best course of action to fix the issue.
With incoming batches, however, you can also take advantage of two columns in <xref linkend="table_incoming_error" xrefstyle="table"/> which are examined each time
Incoming batch errors <emphasis>that are in conflict</emphasis> can by fixed by taking advantage of two columns in <xref linkend="table_incoming_error" xrefstyle="table"/> which are examined each time
batches are processed. The first column, <literal>resolve_data</literal> if filled in will be used in place of <literal>row_data</literal>.
The second column, <literal>resolve_ignore</literal> if set will cause this particular data item to be ignored and batch processing to continue. This is the same
two columns used when a manual conflict resolution strategy is chosen, as discussed in <xref linkend="conflicts"/>.
Expand Down

0 comments on commit e0dca52

Please sign in to comment.