con un clic
almerge
Resolve merge or rebase conflicts. Investigates both sides, resolves the conflicts (with a special case for lock files), and writes a brief summary.
Instalar con Codex o Claude Copia este prompt, pégalo en Codex, Claude u otro asistente, y deja que revise la página de la skill y la instale por ti.