merge when edited by multiple action

[zTrix]

• specify parent commit
• try to auto merge with another commit
  1. success, just continue
  2. failed, give tips, return to edit page with content cache