diff options
| author |  https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U <Richard@web> | 2011-10-23 15:00:49 +0000 |
|---|---|---|
| committer |  admin <admin@branchable.com> | 2011-10-23 15:00:49 +0000 |
| commit | 962fed915ff2b4c652a879c4b7a01086c680c6e0 (patch) | |
| tree | 07bc9805a11c3aeff975e4f8f74651eb571bf9f7 | |
| parent | 721f236e3a96a23d79dcf86ea7ef3d85d7270305 (diff) | |
Added a comment
| -rw-r--r-- | doc/bugs/Prevent_accidental_merges/comment_1_4c46a193915eab8f308a04175cb2e40a._comment | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/bugs/Prevent_accidental_merges/comment_1_4c46a193915eab8f308a04175cb2e40a._comment b/doc/bugs/Prevent_accidental_merges/comment_1_4c46a193915eab8f308a04175cb2e40a._comment new file mode 100644 index 000000000..3e28a28cb --- /dev/null +++ b/doc/bugs/Prevent_accidental_merges/comment_1_4c46a193915eab8f308a04175cb2e40a._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U" + nickname="Richard" + subject="comment 1" + date="2011-10-23T15:00:48Z" + content=""" +Having run into the same issue again, I still think git-annex should ensure no merges take place. The clutter introduced by a .gitnomerge is neglible, imo. +"""]] |