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?
These are pointer files, which are what is stored in git to represent an unlocked annexed file, rather than the symlink that is stored to represent a locked file.
You would usually see these if the file's content is not present in the repository; running
git-annex getshould get it and populate it with the actual file content.The "<<<<<<< HEAD" is a git conflict marker; somehow or other you have gotten two versions of an unlocked annexed file in conflict. This can be resolved the usual way a git conflict would be resolved, by editing it to contain one pointer or the other. Or you can run
git-annex resolvemergeto resolve the conflict the same waygit-annex syncdoes, by checking in both versions of the file with different filenames.