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

comment

Browse source
This commit is contained in:
Joey Hess 2018-01-15 14:19:51 -04:00
parent cd5e1781ac
commit cce2d416d6
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
doc/forum/git-annex_sync_fails_in_repo1_but_not_in_repo2/comment_1_5cca2fbce3db1c691f43e43f9343f9bd._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="joey"
subject="""comment 1"""
date="2018-01-15T18:19:02Z"
content="""
It sounds like deleting `.git/MERGE_HEAD` might fix the problem in the repo
with the problem.
I don't know how you could have gotten the repository into that state..
"""]]