summaryrefslogtreecommitdiff
path: root/doc/tips/what_to_do_when_you_lose_a_repository/comment_3_fa9ca81668f5faebf2f61b10f82c97d2._comment
blob: a8d044c287fb4024270f88e28e6c60cc13e0eada (plain)
1
2
3
4
5
6
7
8
[[!comment format=mdwn
 username="http://joeyh.name/"
 ip="4.153.8.243"
 subject="comment 3"
 date="2012-05-31T17:01:37Z"
 content="""
`dead` is the best we can do. The automatic merging used on the git-annex branch tends to re-add lines that are deleted in one repo when merging with another that still has them.
"""]]