transactions_stuff / Applications]$ git pull
Auto-merging tmp/screen.ls.short
CONFLICT (content): Merge conflict in tmp/screen.ls.short
Auto-merging tmp/screen.ls
CONFLICT (content): Merge conflict in tmp/screen.ls
Automatic merge failed; fix conflicts and then commit the result.
LEDGER_SORT=date LEDGER_BEGIN=2021-08-13 LEDGER_DEPTH=5 LEDGER_END=2021-08-14
transactions_stuff / Applications]$ vi tmps^C
LEDGER_SORT=date LEDGER_BEGIN=2021-08-13 LEDGER_DEPTH=5 LEDGER_END=2021-08-14
transactions_stuff / Applications]$ git pull
error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
LEDGER_SORT=date LEDGER_BEGIN=2021-08-13 LEDGER_DEPTH=5 LEDGER_END=2021-08-14
transactions_stuff / Applications]$ git ^C