diff options
| author |  https://www.google.com/accounts/o8/id?id=AItOawn3p4i4lk_zMilvjnJ9sS6g2nerpgz0Fjc <Matthias@web> | 2014-04-19 17:26:11 +0000 |
|---|---|---|
| committer |  admin <admin@branchable.com> | 2014-04-19 17:26:11 +0000 |
| commit | 4dbf18e8582f2e751853cfafcbd657b93f903230 (patch) | |
| tree | 77e6b3aef973239207fbac5b7575b648b552cb9e | |
| parent | effa3565f4dd8467080212bc6694ed3872f87b65 (diff) | |
Added a comment: auto conflict resolution
| -rw-r--r-- | doc/automatic_conflict_resolution/comment_8_ef474c258ce8e0ebc6485c1366ae6315._comment | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/automatic_conflict_resolution/comment_8_ef474c258ce8e0ebc6485c1366ae6315._comment b/doc/automatic_conflict_resolution/comment_8_ef474c258ce8e0ebc6485c1366ae6315._comment new file mode 100644 index 000000000..81f089b11 --- /dev/null +++ b/doc/automatic_conflict_resolution/comment_8_ef474c258ce8e0ebc6485c1366ae6315._comment @@ -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. +"""]] |