mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Browse source
This commit is contained in:
jnkl 2025-07-17 08:27:22 +00:00 • committed by admin
parent c58aa2cf47
commit cd3f5af7ed
1 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

16
doc/forum/strange_content_of_files.mdwn Normal file
View file

@ -0,0 +1,16 @@
Some of my files suddenly have a content like this:
<<<<<<< HEAD
/annex/objects/SHA256E-s761469--0311429015097e62e392d8c0c7c8250a07eadbf9670f8396286024ebc7b2d9ec.svg
=======
/annex/objects/SHA256E-s744177--4b9dce2dc6a6933defa7b69e5ebbd8f4fd653246c31891b7fb9b27ffec038f22.svg
>>>>>>> refs/remotes/singapore/master
or just
/annex/objects/SHA256E-s1155603--95cefc864632f441029328e96414b026492718789941377f59b1a4bf6694be69.jpg
instead of the actual content. These are not links or something.
What happened?