File: comment_8_ef474c258ce8e0ebc6485c1366ae6315._comment

package info (click to toggle)
git-annex 10.20250416-2
  • links: PTS, VCS
  • area: main
  • in suites: trixie
  • size: 73,572 kB
  • sloc: haskell: 90,656; javascript: 9,103; sh: 1,469; makefile: 211; perl: 137; ansic: 44
file content (8 lines) | stat: -rw-r--r-- 332 bytes parent folder | download | duplicates (11) 
1
2
3
4
5
6
7
8
 
[[!comment format=mdwn
 username="https://www.google.com/accounts/o8/id?id=AItOawn3p4i4lk_zMilvjnJ9sS6g2nerpgz0Fjc"
 nickname="Matthias"
 subject="auto conflict resolution"
 date="2014-04-19T17:26:11Z"
 content="""
Thanks Joey, I could construct a scenario where the auto-conflict-resolution was applied in the master branch.
"""]]