Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

The conflict id is the number shown in the status bar, the resolution can be one of the following:

IGNORE
skip Skip the transaction
RETRY
try Try again
ABORT
abort Abort the apply whole process
RESTART
rollback Rollback and restart the transaction
ROLLBACK
rollbacks Rollbacks the transaction
IGNOREALL
The current and future conflicts in the same transaction will be resolved as ignore

...