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

Added a comment: auto conflict resolution

Browse source
This commit is contained in:
https://www.google.com/accounts/o8/id?id=AItOawn3p4i4lk_zMilvjnJ9sS6g2nerpgz0Fjc 2014-04-19 17:26:11 +00:00 committed by admin
parent a77393d6bd
commit 9ead81dde5
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/automatic_conflict_resolution/comment_8_ef474c258ce8e0ebc6485c1366ae6315._comment Normal file
View file

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