diff options
| author |  Horus <Horus@web> | 2016-05-05 10:00:20 +0000 |
|---|---|---|
| committer |  admin <admin@branchable.com> | 2016-05-05 10:00:20 +0000 |
| commit | d2e7c4db0e65951e5f69e29eb7e8964ecc1a7c27 (patch) | |
| tree | 1f965479ac9952d0d538b31ea25bdf20d51d2ba3 /doc | |
| parent | dd4f86124cd582e0490c69eb660e267ac3bb5a1c (diff) | |
Added a comment
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/forum/HowTo_Conflict_Resolution/comment_5_446186626e5b2d08d078e3b48be06bfa._comment | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/forum/HowTo_Conflict_Resolution/comment_5_446186626e5b2d08d078e3b48be06bfa._comment b/doc/forum/HowTo_Conflict_Resolution/comment_5_446186626e5b2d08d078e3b48be06bfa._comment new file mode 100644 index 000000000..a38aaf361 --- /dev/null +++ b/doc/forum/HowTo_Conflict_Resolution/comment_5_446186626e5b2d08d078e3b48be06bfa._comment @@ -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? +"""]] |