diff --git a/doc/bugs/Deleted_files_during_merge.mdwn b/doc/bugs/Deleted_files_during_merge.mdwn index 8786a1e639..63ef1de7d4 100644 --- a/doc/bugs/Deleted_files_during_merge.mdwn +++ b/doc/bugs/Deleted_files_during_merge.mdwn @@ -2128,3 +2128,11 @@ rsync error: unexplained error (code 255) at io.c(226) [sender=3.1.1] # End of transcript or log. """]] + +> This seems very like the problem described in +> [[git_annex_still_deleting_content_when_merging]]. Without a way to +> reproduce it, I can't tell for sure, but the circumstances of both seem +> the same. I'm going to close this as a duplicate, and have updated the +> other bug report to point to it as more evidence of the bug. [[done]] + +[[!meta title="Assistant deleted modified file during merge"]] diff --git a/doc/bugs/git_annex_still_deleting_content_when_merging.mdwn b/doc/bugs/git_annex_still_deleting_content_when_merging.mdwn index dddef7b362..872b699c0d 100644 --- a/doc/bugs/git_annex_still_deleting_content_when_merging.mdwn +++ b/doc/bugs/git_annex_still_deleting_content_when_merging.mdwn @@ -86,3 +86,12 @@ From ssh://git-annex-asus.local-USER-A_22_sincro/~/sincro # End of transcript or log. """]] + +> [[Deleted_files_during_merge]] seems like much the same problem. +> In both that bug report and this one, the file that gets deleted on B was +> earlier modifed on A. There is a small difference, in that in this bug +> report, A made 2 commits, first deleting the file and then adding back a +> new version. In the other bug report, A made just 1 commit, changing the +> file. --[[Joey]] + +[[!meta title="Assistant deleted file when merging"]]