13 Nov
2022
13 Nov
'22
8:17 a.m.
misunderstood]$ cd ~/src/flat_tree [user@ flat_tree]$ ls flat_tree pyproject.toml random_write_old.py test.py [user@ flat_tree]$ git pull remote: Enumerating objects: 7, done. remote: Counting objects: 100% (7/7), done. remote: Compressing objects: 100% (2/2), done. remote: Total 4 (delta 2), reused 4 (delta 2), pack-reused 0 Unpacking objects: 100% (4/4), 491 bytes | 32.00 KiB/s, done.
From https://github.com/xloem/flat_tree e3177e2..479a424 main -> origin/main Updating e3177e2..479a424 error: Your local changes to the following files would be overwritten by merge: flat_tree/mix_indices_oo.py Please commit your changes or stash them before you merge. Aborting [user@ flat_tree]$