diff options
| author |  https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U <Richard@web> | 2011-07-31 01:20:35 +0000 |
|---|---|---|
| committer |  admin <admin@branchable.com> | 2011-07-31 01:20:35 +0000 |
| commit | ad4528cce83709eb075158ef15fb1fd6faeb1171 (patch) | |
| tree | eb472f7162e9ccccb274df0b4b0c61537e0904b1 | |
| parent | d9cdb5eb457c5069d20c0738158de2423770b3e4 (diff) | |
| -rw-r--r-- | doc/bugs/Prevent_accidental_merges.mdwn | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/bugs/Prevent_accidental_merges.mdwn b/doc/bugs/Prevent_accidental_merges.mdwn new file mode 100644 index 000000000..9b0c8a3de --- /dev/null +++ b/doc/bugs/Prevent_accidental_merges.mdwn @@ -0,0 +1,9 @@ +With the storage layout v3, pulling the git-annex branch into the master branch is... less than ideal. + +The fact that the two branches contain totally different data make an accidental merge worse, arguably. + +Adding a tiny binary file called .gitnomerge to both branches would solve that without any noticeable overhead. + +Yes, there is an argument to be made that this is too much hand-holding, but I still think it's worth it. + +-- Richard |