File: comment_5_446186626e5b2d08d078e3b48be06bfa._comment

package info (click to toggle)
git-annex 7.20190129-3
  • links: PTS, VCS
  • area: main
  • in suites: buster
  • size: 56,292 kB
  • sloc: haskell: 59,105; sh: 1,255; makefile: 225; perl: 136; ansic: 44
file content (9 lines) | stat: -rw-r--r-- 365 bytes parent folder | download | duplicates (7) 
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?
"""]]