mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added a comment

Browse source
This commit is contained in:
Horus 2016-05-05 10:00:20 +00:00 committed by admin
parent 5385ed813f
commit c89d4ab6f3
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
doc/forum/HowTo_Conflict_Resolution/comment_5_446186626e5b2d08d078e3b48be06bfa._comment Normal file
View file

@ -0,0 +1,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?
"""]]