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

response

Browse source
This commit is contained in:
Joey Hess 2025-07-21 12:20:48 -04:00
parent d364e434c8
commit d9bd90e598
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 20 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

20
doc/forum/strange_content_of_files/comment_3_57f12bb9c4333f48755d722a5b3438ac._comment Normal file
View file

@ -0,0 +1,20 @@
[[!comment format=mdwn
username="joey"
subject="""comment 3"""
date="2025-07-21T16:15:37Z"
content="""
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 get` should 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 resolvemerge` to resolve
the conflict the same way `git-annex sync` does, by checking in both
versions of the file with different filenames.
"""]]