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