From 5e1a5ff5085c2aee2aae019de0023fec989ff5e2 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkkyBDsfOB7JZvPZ4a8F3rwv0wk6Nb9n48" Date: Thu, 7 Nov 2013 11:22:50 +0000 Subject: [PATCH] --- doc/todo/wishlist:_detection_of_merge_conflicts.mdwn | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 doc/todo/wishlist:_detection_of_merge_conflicts.mdwn diff --git a/doc/todo/wishlist:_detection_of_merge_conflicts.mdwn b/doc/todo/wishlist:_detection_of_merge_conflicts.mdwn new file mode 100644 index 0000000000..1824a91ee5 --- /dev/null +++ b/doc/todo/wishlist:_detection_of_merge_conflicts.mdwn @@ -0,0 +1,3 @@ +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. + +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.