diff options
| author |  https://www.google.com/accounts/o8/id?id=AItOawkkyBDsfOB7JZvPZ4a8F3rwv0wk6Nb9n48 <Abd@web> | 2013-11-07 11:22:50 +0000 |
|---|---|---|
| committer |  admin <admin@branchable.com> | 2013-11-07 11:22:50 +0000 |
| commit | f12f2a59fb1b667aff759f56cf037dfc0fdf13c3 (patch) | |
| tree | a38423983abb4d0bb6b427d6104ff84292d16a73 /doc/todo | |
| parent | c76fbb534f8f7326993630524fd0eed6e92542b8 (diff) | |
Diffstat (limited to 'doc/todo')
| -rw-r--r-- | doc/todo/wishlist:_detection_of_merge_conflicts.mdwn | 3 |
1 files changed, 3 insertions, 0 deletions
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 000000000..1824a91ee --- /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. |