recovering from the git fiasco
recovering git continue
resolviendo conflictos de commit