docs: add merge failure and recovery docs

Merged
AJ
4mo ago
+115-6
  • update error message to list the correct command
  • add infrahub recover to the CLI reference
  • add a merge failure and recovery section to the user-facing merge docs