doc/bugs/data_loss:_incorrect_merge_upon_conflicting_directory-file_of_direct_repos/comment_1_294c33af08649256908a97894f93c05d._comment


1
2
3
4
5
6
7
8
9
10

[[!comment format=mdwn
 username="https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg"
 nickname="Tim"
 subject="comment 1"
 date="2013-10-13T12:35:47Z"
 content="""
I've just tested a similar scenario with 2 conflicting files, a file-file conflict, and then it works fine. That makes sense, as there's a test written for that.

So the specific bits are: directory-file conflict of repos in direct mode.
"""]]