Two transactions waiting for each other

• A

  Increase the lock timeout so transactions wait longer

• B

  Make every code path lock rows in the same order

• C

  Retry on deadlock, since the database detects and resolves them

• D

  Use a lower isolation level so fewer locks are taken