summaryrefslogtreecommitdiff
path: root/doc/todo/wishlist:_detection_of_merge_conflicts.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-05-29 15:23:05 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-05-29 15:23:05 -0400
commit1f6cfecc972b121fa42ea80383183bbaccc2195a (patch)
tree0a450c4226f5e05c2a3597a9f520376de281fffe /doc/todo/wishlist:_detection_of_merge_conflicts.mdwn
parenta95fb731cd117f35a6e0fce90d9eb35d0941e26e (diff)
remove old closed bugs and todo items to speed up wiki updates and reduce size
Remove closed bugs and todos that were least edited before 2014. Command line used: for f in $(grep -l '\[\[done\]\]' *.mdwn); do if [ -z $(git log --since=2014 --pretty=oneline "$f") ]; then git rm $f; git rm -rf $(echo "$f" | sed 's/.mdwn$//'); fi; done
Diffstat (limited to 'doc/todo/wishlist:_detection_of_merge_conflicts.mdwn')
-rw-r--r--doc/todo/wishlist:_detection_of_merge_conflicts.mdwn13
1 files changed, 0 insertions, 13 deletions
diff --git a/doc/todo/wishlist:_detection_of_merge_conflicts.mdwn b/doc/todo/wishlist:_detection_of_merge_conflicts.mdwn
deleted file mode 100644
index 1b4caeff0..000000000
--- a/doc/todo/wishlist:_detection_of_merge_conflicts.mdwn
+++ /dev/null
@@ -1,13 +0,0 @@
-A conflict during sync or merge is something that requires user intervention, or at least notification. For that reason it would be nice if git annex returned a nonzero exit status when such a conflict happened during a sync or a merge. This is what git does after a conflicting pull, and would make it easier to spot a conflict in automated syncs without having to parse annex output or the logs.
-
-> Good idea, [[done]]. --[[Joey]]
-
-Also, it would be nice if your new `git annex status` were able to inform about remaining conflicts in the repo, for instance by reporting files with variant-XXX suffix.
-
-> Hmm, that would need a separate pass through the whole tree, since
-> currently it can use `git ls-files` to find only modified/deleted/new
-> files. I would rather not make the new `git annex status` slower for
-> this.
->
-> It would be possible to add it to `git annex info` (old `status`)
-> which already has to look through the entire work tree.