summaryrefslogtreecommitdiff
path: root/doc/automatic_conflict_resolution/comment_8_ef474c258ce8e0ebc6485c1366ae6315._comment
blob: 81f089b1140ba6efb3b2e3cba53805f81a6967f1 (plain)
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.
"""]]