$ git checkout --ours -- file1.txt
# Use our version of file1, delete all their changes
$ git checkout --theirs -- file2.txt
# Use their version of file2, delete all our changes
$ git checkout --ours -- file1.txt
# Use our version of file1, delete all their changes
$ git checkout --theirs -- file2.txt
# Use their version of file2, delete all our changes
status | not learned | measured difficulty | 37% [default] | last interval [days] | |||
---|---|---|---|---|---|---|---|
repetition number in this series | 0 | memorised on | scheduled repetition | ||||
scheduled repetition interval | last repetition or drill |