blob: a38aaf361523b767673266a0650b8e443d082e9f (
plain)
1
2
3
4
5
6
7
8
9
|
[[!comment format=mdwn
username="Horus"
subject="comment 5"
date="2016-05-05T10:00:20Z"
content="""
Ok, that something I can understand.
But still, I think, when using git-annex from the command line the situation of a merge conflict is still extremeley hard to handle. What is the reason against adding from which remote the conflicted data comes from?
"""]]
|
