Code
T9102 clash-left
tent history merge --settle was typed while the clashes of the merge are still there: tent.clash.ts in the root of the project, or a file that ends in .theirs. Nothing was recorded.
Details
| The case | What it names |
|---|---|
tent.clash.ts is still in the root of the project | tent.clash.ts |
A file that ends in .theirs is still there, beside a file of bytes that both sides changed | Each such file |
The fix
For each numbered clash of tent.clash.ts, put the definition you want into its own file: ours is there already, and theirs stands in the clash file under a name of its own, as openOrders__theirs. Keep or throw away each .theirs file. Then remove tent.clash.ts and every .theirs file, and type tent history merge --settle again.