git-annex/doc/forum/HowTo_Conflict_Resolution
..
comment_1_81c06a0590ee828749b8d07e008028bb._comment