diff options
author | 2016-04-19 13:46:11 -0400 | |
---|---|---|
committer | 2016-04-19 13:55:29 -0400 | |
commit | dbfc00e2a6ad99200da35f75f889174cd7bfd195 (patch) | |
tree | 9d8a9d1353ab10376183c1bda881fface04b6fcb /doc/todo/Expose_auto-merge_for_manual__44___local_merges.mdwn | |
parent | 41b7950285ef1e91b80c441c2be68a1ef4d0d27c (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/todo/Expose_auto-merge_for_manual__44___local_merges.mdwn')
-rw-r--r-- | doc/todo/Expose_auto-merge_for_manual__44___local_merges.mdwn | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/doc/todo/Expose_auto-merge_for_manual__44___local_merges.mdwn b/doc/todo/Expose_auto-merge_for_manual__44___local_merges.mdwn deleted file mode 100644 index c2cf26f83..000000000 --- a/doc/todo/Expose_auto-merge_for_manual__44___local_merges.mdwn +++ /dev/null @@ -1,9 +0,0 @@ -The automatic conflict resolution currently seems to only work within -the context of sync, when merging «synced/foo» into «foo». It would be -convenient if this functionality were exposed for manual merges -between local branches. - -E.g., one might invoke «git annex merge» or «git annex autoresolve» -after «git merge» when conflicts are found. - -> [[done]] as resolvemerge. --[[Joey]] |