summaryrefslogtreecommitdiff
path: root/doc/bugs/Prevent_accidental_merges.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-04-19 13:46:11 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-04-19 13:55:29 -0400
commitdbfc00e2a6ad99200da35f75f889174cd7bfd195 (patch)
tree9d8a9d1353ab10376183c1bda881fface04b6fcb /doc/bugs/Prevent_accidental_merges.mdwn
parent41b7950285ef1e91b80c441c2be68a1ef4d0d27c (diff)
remove old closed bugs and todo items to speed up wiki updates and reduce size
Remove closed bugs and todos that were last edited or commented before Q3 2015. Command line used: for f in $(grep -l '\[\[done\]\]' -- *.mdwn); do d="$(echo "$f" | sed 's/.mdwn$//')"; if [ -z "$(git log --since=09-09-2015 --pretty=oneline -- "$f")" -a -z "$(git log --since=09-09-2015 --pretty=oneline -- "$d")" ]; then git rm -- "$f"; git rm -rf "$d"; fi; done for f in $(grep -l '|done\]\]' -- *.mdwn); do d="$(echo "$f" | sed 's/.mdwn$//')"; if [ -z "$(git log --since=09-09-2015 --pretty=oneline -- "$f")" -a -z "$(git log --since=09-09-2015 --pretty=oneline -- "$d")" ]; then git rm -- "$f"; git rm -rf "$d"; fi; done
Diffstat (limited to 'doc/bugs/Prevent_accidental_merges.mdwn')
-rw-r--r--doc/bugs/Prevent_accidental_merges.mdwn16
1 files changed, 0 insertions, 16 deletions
diff --git a/doc/bugs/Prevent_accidental_merges.mdwn b/doc/bugs/Prevent_accidental_merges.mdwn
deleted file mode 100644
index 9947f7373..000000000
--- a/doc/bugs/Prevent_accidental_merges.mdwn
+++ /dev/null
@@ -1,16 +0,0 @@
-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
-
-> It should be as easy to undo such an accidential merge
-> as it is to undo any other git commit, right? I quite like that git-annex
-> no longer adds any clutter to the master branch, and would be reluctant
-> to change that. --[[Joey]]
-
-[[wontfix|done]] --[[Joey]]