conflictedHint

tcmts.cli.merge.conflictedHint · #mv5um3kp · term · runs anywhere

What to say of a file that uses conflicted names (uses): settle them first, or, where it holds conflicts being settled (editing), edit them all together.

export function conflictedHint(uses: string[], editing: string[]): string {
  const many = uses.length > 1;
  return `uses ${uses.join(", ")}, which ${many ? "are" : "is"} still conflicted: settle ${many ? "them" : "that"} first (\`tcm edit ${uses[0]}\` merges its sides, \`tcm resolve ${uses[0]} --ours\` or \`--theirs\` keeps one)${editing.length ? `, or edit ${many ? "them all" : "both"} together: \`tcm edit ${[...editing, ...uses].join(" ")}\`` : ""}`;
}

used by