yeah looks like both files had the same changes happen to them 1905. Merge branch 'main' of https://github.com/xloem/flat_tree Auto-merging flat_tree/mix_indices_oo.py Merge made by the 'ort' strategy. flat_tree/mix_indices_oo.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) [user@ flat_tree]$ python3 test.py b'\xacL\t\xc2\x06\xe7\xe34/]\n^HBx\xc3\xa9g\xb3g\x11\xeb\x87\xbd\xc1\xf7z\x7f\x86X\x95C\xe4v(3\x81\x86&Hb|\xc1M\x9e\xc3\x04\xbd\xfc\xe8\xd4eO\xd6\xba\x1a\xe6WX\xdexO\x8f\x92ZUD\xf2P\x16c\x9c\xc1\x83s\xf7\x13ZTq\x9e\xf3\x84\xdd\x02\x8e\xf1\x0f\xce\x17\x16+\xd3\xb5\n)\xd3\x9cz\xf4\xfb\xd3*7\x1b\xdej\xf1p>\xf3\xba' [(9, 9, 0, 45), (9, 18, 45, 39), (3, 21, 84, 13), (1, 22, 97, 1), (1, 23, 98, 8), (-1, b'j\xf1p>\xf3\xba', 106, 6)] b'\xacL\t\xc2\x06\xe7\xe34/]\n^HBx\xc3\xa9g\xb3g\x11\xeb\x87\xbd\xc1\xf7z\x7f\x86X\x95C\xe4v(3\x81\x86&Hb|\xc1M\x9e\xc3\x04\xbd\xfc\xe8\xd4eO\xd6\xba\x1a\xe6WX\xdexO\x8f\x92ZUD\xf2P\x16c\x9c\xc1\x83s\xf7\x13ZTq\x9e\xf3\x84\xdd\x02\x8e\xf1\x0f\xce\x17\x16+\xd3\xb5\n)\xd3\x9cz\xf4\xfb\xd3*7\x1b\xdej\xf1p>\xf3\xba' [user@ flat_tree]$ echo $? 0 [user@ flat_tree]$ git push Enumerating objects: 32, done. Counting objects: 100% (28/28), done. Delta compression using up to 4 threads Compressing objects: 100% (18/18), done. Writing objects: 100% (18/18), 2.46 KiB | 2.46 MiB/s, done. Total 18 (delta 9), reused 0 (delta 0), pack-reused 0 remote: Resolving deltas: 100% (9/9), completed with 5 local objects. To https://github.com/xloem/flat_tree 479a424..7e9ff54 main -> main I should now test my "log" repository, which depends on this one.