TESSERA

Appearance

tes resolve ​

Resolve a merge conflict in a file using a specified strategy.

Usage ​

bash
tes resolve <path> --strategy <strategy>

Options ​

  • -s, --strategy <STRATEGY> - Resolution strategy (ast-union, ours, theirs, or working).

Description ​

The resolve command clears the conflict record for <path>, writes the chosen resolution to disk and the target branch, and replaces any intermediate conflict commit cleanly:

  • ast-union - Combine both sides' AST declarations and statements in order.
  • ours - Keep the first session or branch's version.
  • theirs - Keep the second session or branch's version.
  • working - Use the file as currently edited and saved on disk.

Examples ​

bash
# combine both sides using AST union
tes resolve src/App.vue --strategy ast-union

# keep the first branch's version
tes resolve src/App.vue --strategy ours

# keep the second branch's version
tes resolve src/App.vue --strategy theirs

# resolve using the manually edited file on disk
tes resolve src/App.vue --strategy working